Message ID | 20230217140939.487978-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 s9csp907487wrn; Fri, 17 Feb 2023 06:13:19 -0800 (PST) X-Google-Smtp-Source: AK7set9kNUwEIHF9L5fUs32IfwhZownasI+12wTCE2GUeimsExDBs0YzrEJXLwF7sgKKZnJVW6FY X-Received: by 2002:a17:90a:c90e:b0:233:ee70:800 with SMTP id v14-20020a17090ac90e00b00233ee700800mr1176677pjt.37.1676643199168; Fri, 17 Feb 2023 06:13:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676643199; cv=none; d=google.com; s=arc-20160816; b=i2/eUn1DU46AfKOmA+s0J0i/u2WDEMeDYRxqVQu9FppTcG/cWr15zeiFCJf8WrtSBQ ggpA327uy4aiIHjc34g5p+7xkCZkLFABra1MIMoqx9hWbXrpzecJ8PxGt7AqYYZevsYy Fzi1BTJTfO4GosbjpR7FonBGo0Ab79HgeIWUpea+GSuPQSXa2fLK3MGg81HHbSZNDxNQ 7fAtnK+x7X4BM5OIZWYvdbtYah1NnhzTEOVwMzU7iJABXbxjVi9MtZIgxBkTJs2UXRcI q4j65ZcmA4jVg6pnfn7uetOs+/JkiXIxmuoFF1aBJX/axPklikgxf9mL7RYIPVe/2yjn YzXw== 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=vSzmssBCCpn7WRxL/wq939F55EgA8d0CajeeGCW+68w=; b=DkKZV59toYnJ5RkdZ4Sxhguq2iKp46YdQCHzbtjKjChTmo+8UiDwsWQ8YMoJThevkJ nsLFLldAnF2ma97Ydtrr4wcXzb1fAhrMc71b+COOofuosbA2rlpIYVdOjhyfmC09ukpI +qKUg0a3qVksW46lDNR0G9nRBGnGGmqnfGrlQvMNPXvwxobhVaquPpyEyharEGJejBy8 jiuSQCx41CZZLkAWLEgl3uuiOT8axj/fH1vL34esY+e3HL5PVO+RQhncMlCxdm8NQKAD FCTrf7tWy8G7p4CqPFaP3xSE+YTb2G/kyvvNGDpDsSMjctr4eyz6GwaCYUFMjIGnNx9o /Xxg== 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 cl3-20020a17090af68300b00233f65e8f1csi8245857pjb.126.2023.02.17.06.13.06; Fri, 17 Feb 2023 06:13:19 -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 S230006AbjBQOJo (ORCPT <rfc822;aimixsaka@gmail.com> + 99 others); Fri, 17 Feb 2023 09:09:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229948AbjBQOJn (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 17 Feb 2023 09:09:43 -0500 Received: from exchange.fintech.ru (exchange.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90E1F67816; Fri, 17 Feb 2023 06:09:42 -0800 (PST) Received: from Ex16-01.fintech.ru (10.0.10.18) by exchange.fintech.ru (195.54.195.159) with Microsoft SMTP Server (TLS) id 14.3.498.0; Fri, 17 Feb 2023 17:09:40 +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; Fri, 17 Feb 2023 17:09:40 +0300 From: Natalia Petrova <n.petrova@fintech.ru> To: Ido Schimmel <idosch@nvidia.com> CC: Natalia Petrova <n.petrova@fintech.ru>, Petr Machata <petrm@nvidia.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <lvc-project@linuxtesting.org> Subject: [PATCH] mlxsw_spectrum_router: add check for return value of 'mlxsw_sp_rif_find_by_dev' Date: Fri, 17 Feb 2023 17:09:39 +0300 Message-ID: <20230217140939.487978-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?1758087819199390454?= X-GMAIL-MSGID: =?utf-8?q?1758087819199390454?= |
Series |
mlxsw_spectrum_router: add check for return value of 'mlxsw_sp_rif_find_by_dev'
|
|
Commit Message
Natalia Petrova
Feb. 17, 2023, 2:09 p.m. UTC
Pointer 'rif' that contains the return value of 'mlxsw_sp_rif_find_by_dev'
is checked for NULL to avoid possible undefined behavior below caused by
dereference in 'mlxsw_sp_rif_destroy'.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: e4f3c1c17b6d ("mlxsw: spectrum_router: Implement common RIF core")
Signed-off-by: Natalia Petrova <n.petrova@fintech.ru>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
Natalia Petrova <n.petrova@fintech.ru> writes: > Pointer 'rif' that contains the return value of 'mlxsw_sp_rif_find_by_dev' > is checked for NULL to avoid possible undefined behavior below caused by > dereference in 'mlxsw_sp_rif_destroy'. > > Found by Linux Verification Center (linuxtesting.org) with SVACE. > > Fixes: e4f3c1c17b6d ("mlxsw: spectrum_router: Implement common RIF core") > Signed-off-by: Natalia Petrova <n.petrova@fintech.ru> > --- > drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c > index 2c4443c6b964..4f41b83d7c9e 100644 > --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c > +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c > @@ -8658,7 +8658,8 @@ static int mlxsw_sp_inetaddr_bridge_event(struct mlxsw_sp *mlxsw_sp, > break; > case NETDEV_DOWN: > rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev); > - mlxsw_sp_rif_destroy(rif); > + if (rif) > + mlxsw_sp_rif_destroy(rif); > break; > } I don't think this can happen. The corresponding NETDEV_UP is invoked through address validator chain, so failures to create a RIF would be vetoed. Furthermore the DOWN event itself is invoked by mlxsw_sp_inetaddr_event(), where the invocation is contingent on mlxsw_sp_rif_should_config(). That would be false if there's no RIF.
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 2c4443c6b964..4f41b83d7c9e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -8658,7 +8658,8 @@ static int mlxsw_sp_inetaddr_bridge_event(struct mlxsw_sp *mlxsw_sp, break; case NETDEV_DOWN: rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev); - mlxsw_sp_rif_destroy(rif); + if (rif) + mlxsw_sp_rif_destroy(rif); break; }