Message ID | 20230125141328.8479-1-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 s9csp299986wrn; Wed, 25 Jan 2023 06:22:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXuai292wYw2SN/LJQW2qZzTfcYyzcZpVTXyYWtDVDABJxFnUYJI1m4MeXAz79WxpchviX+f X-Received: by 2002:a05:6a20:7d90:b0:b8:6395:406e with SMTP id v16-20020a056a207d9000b000b86395406emr43678472pzj.15.1674656571387; Wed, 25 Jan 2023 06:22:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674656571; cv=none; d=google.com; s=arc-20160816; b=My9RLB1b0DOLsdpeGFBlsltdeXmjXtgoIwmNmF/3RtadPAoPM8K/6+X4g+qRa15JaT Vpq8x401pwp9dkc2u6Cg5DBopmPyJi9VPmZHUAh8qlfKt7FT4tfDf+eBE8zs/MJan033 oYpQ/iVZloSqw5ViT1ihPYs4uIEjlZmpteZWJkncM+ms7KHDv726mpLuOZLJsPm1x6Lt 9FjdoSPyDZQg0O670ZRqBihRG+lA2pMoi4UbIro/F8+n50HX8Od2VCqJPS6tssfuHHoK SXXXKdZHMAOKeMMtgSeZsNp83npvNtlS6HO2lOTRuJ88BQi5TC+32H+TOvvxduUsC0Uo 1sLw== 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 :message-id:date:subject:cc:to:from; bh=lR1EaoYA702vx83U1zkBEh+PvHDKcqZdB267fPeqF6Y=; b=rkxEAmqVHjROdtVjW1eRtMKQqsXLDVM5z5Q6F6O5I3pFqqwCzHj8IEL9RAJm3QGdt+ 0TYqeDoBdWCYa1HtDDQff3wwlr91u6PwuQsMrdW7IGmprc2hd6YaxFh86cO7AKmDByj6 16GjCu7lfAGfxbhQf+IY+kj+CXGjL+GQgXXXfJCdzRD4NfsOdc+LtkIwiCpqGEvWqsPO ECuMdWZMh4QelGZcOJmeibV5m54+0Gx91rLNaU38fd8f6W0gWddEXJhTaMWKF9N2dlgC VClIX/reX4lHnbaCRn5H73/2cIJTit9fSl5rkNGzpO1XCe3PBn6bHmlT5+b/XYEGVQiU DpMw== 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 66-20020a620645000000b00540d97d4509si5399681pfg.58.2023.01.25.06.22.31; Wed, 25 Jan 2023 06:22:51 -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 S235448AbjAYONh (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Wed, 25 Jan 2023 09:13:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjAYONe (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 25 Jan 2023 09:13:34 -0500 Received: from exchange.fintech.ru (exchange.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF1CF2940E; Wed, 25 Jan 2023 06:13:33 -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; Wed, 25 Jan 2023 17:13:32 +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; Wed, 25 Jan 2023 17:13:31 +0300 From: Natalia Petrova <n.petrova@fintech.ru> To: Jesse Brandeburg <jesse.brandeburg@intel.com> CC: Natalia Petrova <n.petrova@fintech.ru>, 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] i40e: Add checking for null for nlmsg_find_attr() Date: Wed, 25 Jan 2023 17:13:28 +0300 Message-ID: <20230125141328.8479-1-n.petrova@fintech.ru> X-Mailer: git-send-email 2.34.1 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?1756004688747310918?= X-GMAIL-MSGID: =?utf-8?q?1756004688747310918?= |
Series |
i40e: Add checking for null for nlmsg_find_attr()
|
|
Commit Message
Natalia Petrova
Jan. 25, 2023, 2:13 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' finction,
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 Wed, Jan 25, 2023 at 05:13:28PM +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' finction, > 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 b36bf9c3e1e4..ed4be4ffeb09 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -13101,6 +13101,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 -ENOENT; Seems fine to me, but I wonder if -EINVAL is more appropriate. nlh is invalid in this case. > > nla_for_each_nested(attr, br_spec, rem) { > __u16 mode; > -- > 2.34.1 >
On Wed, Jan 25, 2023 at 05:13:28PM +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' finction, s/finction/function Regards, ./drv
Dear Natalia, Thank you for your patch. Am 25.01.23 um 15:13 schrieb Natalia Petrova: In the commit message summary, you could use: Check if nlmsg_find_attr() returns null > The result of nlmsg_find_attr() 'br_spec' is dereferenced in > nla_for_each_nested, but it can take null value in 'nla_find' finction, f*u*nction > 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 b36bf9c3e1e4..ed4be4ffeb09 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -13101,6 +13101,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 -ENOENT; > > nla_for_each_nested(attr, br_spec, rem) { > __u16 mode; Kind regards, Paul
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index b36bf9c3e1e4..ed4be4ffeb09 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13101,6 +13101,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 -ENOENT; nla_for_each_nested(attr, br_spec, rem) { __u16 mode;