Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp845838pja; Wed, 1 Apr 2020 09:44:49 -0700 (PDT) X-Google-Smtp-Source: ADFU+vscrlF63rhcLvBXbJc0sfbTBFQntXGuwmozydq2N+7sRVehxXATqocfLUMivarKnvjB2yHP X-Received: by 2002:a05:6830:1003:: with SMTP id a3mr18409467otp.128.1585759488993; Wed, 01 Apr 2020 09:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759488; cv=none; d=google.com; s=arc-20160816; b=c+iyMvXGreSZ8XZ+MFNmgM54ClfmPH6cLrskOBLEi12PShBXAYP3yPGPO2B5rmQgjS 6qgT/uQzn9bKRm2K+sylwsmvZQIB1tC4v23PMI/JY0Ipn980W85xuktCuU9I+FW0bw/q 7MoDSX8Urf06U2icwJYFSq8uEs36DO1FOHYUqcrVsNgk4hMqtnzTLgGneWCIDdRidi3N 7wTPGow4QnvzCs+D2iGp23uDyDUJaZ4yGbHYIt+4mUeHepwEPwypC90JGVGnQ2oOqcgA k7HLlyfptqFc7TLcHoJeOpM5UlXJlTgLgRbXRY27LhTpNSNyFLchGfjTIIzD+Pw0gMY6 pikQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E1aGtrdMYNxAC16yPkMcDZFIgjEDFNJVlC2ENhX3Zfg=; b=WKCQYdEJIqQsZuvuRx0C7y8PCeeULTVP5BNvbE5J6RwiQ4RG6s5Ev5F0of5u16btXh 3Flu58lTekdFGEN0N+8ybn8oNORecT+4TjqlhgUSTKlZXPQkeXYsSfJvmFB1yFkkaRZu Oa+kBmdwL5CNmUbRzBtFhXTBTkIahVXn6pL6Eo8xEpssf41RfbKq9NRPvKs+nUo8J5ph wuLAQs9lotU7pJ03C5/M91bVVbHDmZlmOT2OlHiJVmu5LmZh3ee/y+9qldMZDath1I6b uTZ06NqTwOkMrk57zYJAT/lZIhIsKIgbmd4jp5pwr3dOsfDnfhQb1Z2uECMPbBWX2JKI RBrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j++y4RL1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r82si1159028oia.155.2020.04.01.09.44.34; Wed, 01 Apr 2020 09:44:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j++y4RL1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389359AbgDAQms (ORCPT + 99 others); Wed, 1 Apr 2020 12:42:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:43406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389549AbgDAQmq (ORCPT ); Wed, 1 Apr 2020 12:42: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 A668120658; Wed, 1 Apr 2020 16:42:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759366; bh=nSL2VlQVTb3GPKokrRs/RPqS8c005cAw2vMQezf9gH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j++y4RL1QHywzNAWXE53M6NMweabNQe6cbW/qU8LHG1nOqaXS6QemQoP8gWy3T2J2 l/VEywtbg5St6In71R2F7bvQ23+FuAOsGmYT6pbHN1G0q9Xv3ceP2IkntUrZq7OcWf Zjun5PBE5mQ594CaUOwO6wkR0umJvBH1KzsGo4xc= 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 4.14 057/148] macsec: restrict to ethernet devices Date: Wed, 1 Apr 2020 18:17:29 +0200 Message-Id: <20200401161558.433370616@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -3219,6 +3220,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;