From patchwork Tue Mar 31 08:57:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 228702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB94DC43331 for ; Tue, 31 Mar 2020 09:01:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83AD7208E0 for ; Tue, 31 Mar 2020 09:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645307; bh=G19ygq6fSFuM9CneHTe6LevYWq0Om8ZQbtCSGqMYeus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hbF2KtsX6vQJT3+JVkymstRVAXf8YbWdlqNwd6tzoPtodgzjptF9qziSwutzOGue5 UDnak1klUD/ag2haprzOtV0BZfvd1z5oj9BcrkiyVEZkrbDfv10kJtY1Oq2hP3YZDn x6jmUCc9kteUQGVMR+8wVMh0tNRchBaVrA2IjLdw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730610AbgCaJBq (ORCPT ); Tue, 31 Mar 2020 05:01:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:41044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730607AbgCaJBq (ORCPT ); Tue, 31 Mar 2020 05:01:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1F4D020B80; Tue, 31 Mar 2020 09:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645305; bh=G19ygq6fSFuM9CneHTe6LevYWq0Om8ZQbtCSGqMYeus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qJp12BKlCgnV76t/G1uyw5WW1nc2qZVETFCI1qHfhT6BmLmkPdVEm8gi9Qk5XKrL5 /KiZt/y8dAe2WrF8E06xebA1rDJfUfelCVanxTgyksVmq8Cj2r2E2BJedHZZ6m12/k iZhW1sYFyKo3qgrNK4kZPPYBT7q6susdMbyQvT20= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot , Willem de Bruijn , "David S. Miller" Subject: [PATCH 5.5 013/170] macsec: restrict to ethernet devices Date: Tue, 31 Mar 2020 10:57:07 +0200 Message-Id: <20200331085425.532956313@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085423.990189598@linuxfoundation.org> References: <20200331085423.990189598@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Willem de Bruijn [ Upstream commit b06d072ccc4b1acd0147b17914b7ad1caa1818bb ] Only attach macsec to ethernet devices. Syzbot was able to trigger a KMSAN warning in macsec_handle_frame by attaching to a phonet device. Macvlan has a similar check in macvlan_port_create. v1->v2 - fix commit message typo Reported-by: syzbot Signed-off-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -3236,6 +3237,8 @@ static int macsec_newlink(struct net *ne real_dev = __dev_get_by_index(net, nla_get_u32(tb[IFLA_LINK])); if (!real_dev) return -ENODEV; + if (real_dev->type != ARPHRD_ETHER) + return -EINVAL; dev->priv_flags |= IFF_MACSEC;