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 61D52A0093 for ; Thu, 10 Mar 2022 13:12:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5869B41144; Thu, 10 Mar 2022 13:12:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DE9AB4113E for ; Thu, 10 Mar 2022 13:12:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9J2IcRkVue59UmE6ravS/yIonGFIeLubZ6iy8WjhInw=; b=T7WrPPtpqE6Pi4ciOECs6+NsYKspbZpnR96rTAh+hzziI1s9QXfXmDaYnnHqIcDKLaEeYq L+0iStigFMte/Ld7erfcM5dv5Mc7apd0PfSsxbChYUMrDFbIVdkmg76b4OcgKKl4rVYC6p z/fXpaDLQDyGHPXn7m3EHkTZTrZVQAM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-SDjRVI92PGCk3r0LyXLL2Q-1; Thu, 10 Mar 2022 07:12:02 -0500 X-MC-Unique: SDjRVI92PGCk3r0LyXLL2Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE718801AFE; Thu, 10 Mar 2022 12:12:00 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBF8E7FCE8; Thu, 10 Mar 2022 12:11:59 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix null dereference in session cleanup' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:11 +0000 Message-Id: <20220310121127.1324802-5-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/14/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9bdcba122b7652766ebce143dcc8a1717ded183b Thanks. Kevin --- >From 9bdcba122b7652766ebce143dcc8a1717ded183b 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/tf_core/tf_session.c b/drivers/net/bnxt/tf_core/tf_session.c index 9f849a0a76..c30c0e7029 100644 --- a/drivers/net/bnxt/tf_core/tf_session.c +++ b/drivers/net/bnxt/tf_core/tf_session.c @@ -231,8 +231,10 @@ tf_session_create(struct tf *tfp, strerror(-rc)); } + if (tfp->session) { + tfp_free(tfp->session->core_data); + tfp_free(tfp->session); + tfp->session = NULL; + } - tfp_free(tfp->session->core_data); - tfp_free(tfp->session); - tfp->session = NULL; return rc; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.573255510 +0000 +++ 0012-net-bnxt-fix-null-dereference-in-session-cleanup.patch 2022-03-10 12:05:31.249630727 +0000 @@ -1 +1 @@ -From a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 Mon Sep 17 00:00:00 2001 +From 9bdcba122b7652766ebce143dcc8a1717ded183b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org