From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 28D85A0093 for ; Wed, 9 Mar 2022 17:32:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23B1F410E6; Wed, 9 Mar 2022 17:32:25 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 0FB1C410E6 for ; Wed, 9 Mar 2022 17:32:24 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id n33-20020a05600c3ba100b003832caf7f3aso3221066wms.0 for ; Wed, 09 Mar 2022 08:32:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MQ5Ipz6UCwMR7B8sikf+w2XGY7jO1Ye7NhzTfadkeVU=; b=n/Ff0KxyPjTe4RgwEmO+GkAgGx8IiU3xtXtoXM3W6nvzv3fI39zao8Q5RxWuEs5QNo mo913swH6JGNG1kL8lIs8egkIU6FKUFoH6asWwqYBx1W9RaJ0r+l2wgCUhFmuWMahL+5 5/IAgU5mTg7KCbrhNjWVgUZmNykMMxkJBgAP4Irc4JyGmf+UKIx38HjUqigmY++OgJgm 7AR57ylT/QS6JxMhfva/yXNF0WSzfYfBZ27fil3tNANEMDeGBKfzKWj/lq2qyzd3gprc YORBLUFBdS9BWPeO8k1xu2q7OHPQTlw+d2Os7IIQ2n1DHRrVJr55eTB4Z/2fx5pxv1mH gZ7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MQ5Ipz6UCwMR7B8sikf+w2XGY7jO1Ye7NhzTfadkeVU=; b=xDd2RV9URqSnSxwyfwpBTtOz0mZUk3eIAlioMv1xqI6s6fMxaRmTYQt+t0A6b0jWjd y+Jf0ygR28LeY9QMH+ZVAzyopczmz5q+wsnvhzrykZnxNWvY+Cp2TpNO17T8PLqfBC28 Uu0qUI5vjtPW/HrLPjMqMkcTyLpwZioKTcf7F5dsP2nGeriNX/ZYvn2H7TrRrznzCKCC s36inyT4BrevaeNFwXtcI20zvWPApOKBxn9Y2GdPCD5MapEw4E04UZDrMDo61pTsnp84 Cj1sOC72wUhwTA4bQUeH8aojaIv/iPIZBs/J0qG9GPYud0vFPfeYiOzozhoA4gpS8kSH QiGQ== X-Gm-Message-State: AOAM533L74xQDd4vV8U7SyKZkZRxY+VTKgsxbG5ppbxCr9p2xnjt8Fpo CTY5NJ7wp/Qc2GpQpN7h8EDnuDXAEyM= X-Google-Smtp-Source: ABdhPJzAva8E8aPbrNJQCk0TGxeoFPNp9Nmar8GvnVL34ZcYICT0MlscFmH3o3PWv+dj/OOvaWRkvQ== X-Received: by 2002:a05:600c:3544:b0:389:bdcf:d6e3 with SMTP id i4-20020a05600c354400b00389bdcfd6e3mr8303386wmq.134.1646843543773; Wed, 09 Mar 2022 08:32:23 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id k17-20020a05600c1c9100b00386bb6e9c50sm8407695wms.45.2022.03.09.08.32.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:32:22 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix null dereference in session cleanup' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:44 +0000 Message-Id: <20220309163053.245754-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cfd9d0902d95112a2b9c18edc5382eca5f34e745 Thanks. Luca Boccassi --- >From cfd9d0902d95112a2b9c18edc5382eca5f34e745 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Thu, 24 Feb 2022 23:53:59 +0800 Subject: [PATCH] net/bnxt: fix null dereference in session cleanup [ upstream commit a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 ] In tf_session_create(), there is a case that with 'tfp->session' still be NULL and run 'goto cleanup', which will leads to a null dereference by 'tfp_free(tfp->session->core_data)' in the cleanup. Fixes: a46bbb57605b ("net/bnxt: update multi device design") Signed-off-by: Weiguo Li Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_core/tf_session.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/tf_core/tf_session.c b/drivers/net/bnxt/tf_core/tf_session.c index c95c4bdbd3..598338d46c 100644 --- a/drivers/net/bnxt/tf_core/tf_session.c +++ b/drivers/net/bnxt/tf_core/tf_session.c @@ -182,9 +182,12 @@ tf_session_create(struct tf *tfp, return 0; cleanup: - tfp_free(tfp->session->core_data); - tfp_free(tfp->session); - tfp->session = NULL; + if (tfp->session) { + tfp_free(tfp->session->core_data); + tfp_free(tfp->session); + tfp->session = NULL; + } + return rc; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.544325884 +0000 +++ 0028-net-bnxt-fix-null-dereference-in-session-cleanup.patch 2022-03-09 16:30:08.559025422 +0000 @@ -1 +1 @@ -From a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 Mon Sep 17 00:00:00 2001 +From cfd9d0902d95112a2b9c18edc5382eca5f34e745 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17,2 @@ - drivers/net/bnxt/tf_core/tf_session.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + drivers/net/bnxt/tf_core/tf_session.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) @@ -20 +21 @@ -index 9f849a0a76..c30c0e7029 100644 +index c95c4bdbd3..598338d46c 100644 @@ -23,4 +24,7 @@ -@@ -230,10 +230,12 @@ tf_session_create(struct tf *tfp, - "FW Session close failed, rc:%s\n", - strerror(-rc)); - } +@@ -182,9 +182,12 @@ tf_session_create(struct tf *tfp, + return 0; + + cleanup: +- tfp_free(tfp->session->core_data); +- tfp_free(tfp->session); +- tfp->session = NULL; @@ -32,4 +36 @@ - -- tfp_free(tfp->session->core_data); -- tfp_free(tfp->session); -- tfp->session = NULL; ++