Message ID | 20230126135555.11407-2-n.petrova@fintech.ru |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp291072wrn; Thu, 26 Jan 2023 06:13:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXtFlHHQSheUKL89tMplc/i27Qj3QoC/sfjxh24JMJf5P6p+Zzmdk/PmL1/2hvUxdYhHQnI1 X-Received: by 2002:a17:902:ce8f:b0:195:f3e6:ab9f with SMTP id f15-20020a170902ce8f00b00195f3e6ab9fmr27302341plg.51.1674742409112; Thu, 26 Jan 2023 06:13:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674742409; cv=none; d=google.com; s=arc-20160816; b=dfSq9H6bBxwE2hTYHBvsLZZlBAaXog2V4FwMoC7CwEdFLoL7dx9FFZInhaHmqfaOBo m79qK9Spd7nmfDcwqqgnQtzOlEcSoP7WZoKqy+8DvB7qtYuM1aqNnyNKYLp2GtuCVt1e eaxMJfMiyQFYFQpIp6WOvPBx2JFqBkVC4WOPIlOqlwT64W6ZYXDK+jNNMwLHWN7QwifB TOvQWIqeiVc1TFzx6CXQI6qh6V40twVsOJv483RNT3xfqnVC7+d7U75eNL1TCiey3eow lijKUJ5Ir2/JjwgD7dc6Ko8h54ncDjqzPFNwSfr+GI8fSrKsizk97ZLQSFeu/Xlw9saD LsQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2MfIb+TH8plgoWnG0WKsCT2Xaj8s1JAkHZHv8drygQ8=; b=XJb1v2pvyQ7L8fCkbDJbAHrSO3bR2nGhUXbWFTn/RjF2yiS6yeGxNKc2RM37uHh8Ef MyGN/T/7raTM+IwncT0GGXs8UlCjgAKEtk0kTU6IC8XfXSJ2hUv0Gixn6NdPZDD/v/nD HMbcg/8klJiNBbtJqxkIlLJ7mrNAJfuinFA1UrSsHp9Nv56iJIY0MWz0yHWUZVy5eBv2 o/1aiB0EDaaB/QNBQqQ0uvmTtvRbuczLjzBY6by3JVxiViHzLw6AoOhro0oiqoryt9hY /g/qu5Aqg8HurlgXOH8E2JISgVQK6A82FrsxHg0FVrgl6lNIiz2NnkKYXwsgNNCAnutt s2WQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i2-20020a17090332c200b001945ff85d7asi1825327plr.357.2023.01.26.06.13.03; Thu, 26 Jan 2023 06:13:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231558AbjAZN7E (ORCPT <rfc822;lekhanya01809@gmail.com> + 99 others); Thu, 26 Jan 2023 08:59:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230404AbjAZN67 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 26 Jan 2023 08:58:59 -0500 Received: from exchange.fintech.ru (exchange.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35BDE1043B; Thu, 26 Jan 2023 05:58:53 -0800 (PST) Received: from Ex16-01.fintech.ru (10.0.10.18) by exchange.fintech.ru (195.54.195.169) with Microsoft SMTP Server (TLS) id 14.3.498.0; Thu, 26 Jan 2023 16:56:20 +0300 Received: from KANASHIN1.fintech.ru (10.0.253.125) by Ex16-01.fintech.ru (10.0.10.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Thu, 26 Jan 2023 16:56:20 +0300 From: Natalia Petrova <n.petrova@fintech.ru> To: <stable@vger.kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: Natalia Petrova <n.petrova@fintech.ru>, Jesse Brandeburg <jesse.brandeburg@intel.com>, Tony Nguyen <anthony.l.nguyen@intel.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, <intel-wired-lan@lists.osuosl.org>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <lvc-project@linuxtesting.org> Subject: [PATCH 5.10 1/1] i40e: Add checking for null for nlmsg_find_attr() Date: Thu, 26 Jan 2023 16:55:55 +0300 Message-ID: <20230126135555.11407-2-n.petrova@fintech.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126135555.11407-1-n.petrova@fintech.ru> References: <20230126135555.11407-1-n.petrova@fintech.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.0.253.125] X-ClientProxiedBy: Ex16-01.fintech.ru (10.0.10.18) To Ex16-01.fintech.ru (10.0.10.18) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756094675426908732?= X-GMAIL-MSGID: =?utf-8?q?1756094696116002600?= |
Series |
i40e: Add checking for null for nlmsg_find_attr()
|
|
Commit Message
Natalia Petrova
Jan. 26, 2023, 1:55 p.m. UTC
The result of nlmsg_find_attr() 'br_spec' is dereferenced in
nla_for_each_nested(), but it can take null value in nla_find() function,
which will result in an error.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 51616018dd1b ("i40e: Add support for getlink, setlink ndo ops")
Signed-off-by: Natalia Petrova <n.petrova@fintech.ru>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++
1 file changed, 2 insertions(+)
Comments
On 1/26/2023 5:55 AM, Natalia Petrova wrote: > The result of nlmsg_find_attr() 'br_spec' is dereferenced in > nla_for_each_nested(), but it can take null value in nla_find() function, > which will result in an error. > > Found by Linux Verification Center (linuxtesting.org) with SVACE. > > Fixes: 51616018dd1b ("i40e: Add support for getlink, setlink ndo ops") > Signed-off-by: Natalia Petrova <n.petrova@fintech.ru> > --- > drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c > index 53d0083e35da..4626d2a1af91 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -13167,6 +13167,8 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, > } > > br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); > + if (!br_spec) > + return -EINVAL; > > nla_for_each_nested(attr, br_spec, rem) { > __u16 mode; Makes sense to me. Thanks. Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
On 1/26/2023 11:55 AM, Jesse Brandeburg wrote: > On 1/26/2023 5:55 AM, Natalia Petrova wrote: >> The result of nlmsg_find_attr() 'br_spec' is dereferenced in >> nla_for_each_nested(), but it can take null value in nla_find() function, >> which will result in an error. >> >> Found by Linux Verification Center (linuxtesting.org) with SVACE. >> >> Fixes: 51616018dd1b ("i40e: Add support for getlink, setlink ndo ops") >> Signed-off-by: Natalia Petrova <n.petrova@fintech.ru> >> --- >> drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c >> b/drivers/net/ethernet/intel/i40e/i40e_main.c >> index 53d0083e35da..4626d2a1af91 100644 >> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c >> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c >> @@ -13167,6 +13167,8 @@ static int i40e_ndo_bridge_setlink(struct >> net_device *dev, >> } >> br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), >> IFLA_AF_SPEC); >> + if (!br_spec) >> + return -EINVAL; >> nla_for_each_nested(attr, br_spec, rem) { >> __u16 mode; > > Makes sense to me. Thanks. > > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > I presume that you meant this to be targeted to the "net" tree, which you should indicate with the subject line: [PATCH net ...] as per the netdev rules published [1], and generally you don't need a cover letter for a single patch. [1] https://www.kernel.org/doc/html/v5.10/networking/netdev-FAQ.html
On Thu, Jan 26, 2023 at 04:55:55PM +0300, Natalia Petrova wrote: > The result of nlmsg_find_attr() 'br_spec' is dereferenced in > nla_for_each_nested(), but it can take null value in nla_find() function, > which will result in an error. > > Found by Linux Verification Center (linuxtesting.org) with SVACE. > > Fixes: 51616018dd1b ("i40e: Add support for getlink, setlink ndo ops") > Signed-off-by: Natalia Petrova <n.petrova@fintech.ru> > --- > drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ > 1 file changed, 2 insertions(+) <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 53d0083e35da..4626d2a1af91 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13167,6 +13167,8 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, } br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); + if (!br_spec) + return -EINVAL; nla_for_each_nested(attr, br_spec, rem) { __u16 mode;