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 469FDA034F for ; Mon, 21 Feb 2022 16:38:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17DFD410F7; Mon, 21 Feb 2022 16:38:45 +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 EE07F410F3 for ; Mon, 21 Feb 2022 16:38:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457922; 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=8hn6DL8XnTcQp3blp75iSZ0wBcaY+BuEbpFT6vlcvHE=; b=ECv2hfTpe2M1Vza/KA8B9uFSf4nSehiKDqJulKkvcaP6YUiFVlO404HcsffHydJFmlthi+ fZpyUgZkiv3d6jMykEX2mhis/uBB7ezxDLl1XZqBRPt4gnnqc0xXuWaye5t3BFKI96CueJ yoGAnWYvtNrzvWpwyf+WQLjjPuOJqs0= 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-312-Cf2T2wExNR6prBj0Fdc8qw-1; Mon, 21 Feb 2022 10:38:31 -0500 X-MC-Unique: Cf2T2wExNR6prBj0Fdc8qw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE76780A1BC; Mon, 21 Feb 2022 15:38:30 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id A55F47E133; Mon, 21 Feb 2022 15:38:29 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: add null check for mark table' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:06 +0000 Message-Id: <20220221153625.152324-57-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 02/26/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/6b722d7b3729a4cb3af2dd5356336b19e403b961 Thanks. Kevin --- >From 6b722d7b3729a4cb3af2dd5356336b19e403b961 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 4 Jan 2022 14:08:15 +0530 Subject: [PATCH] net/bnxt: add null check for mark table [ upstream commit 8a553bdf261f4e05a774d243bf0278ac1baf55c8 ] During the port start, driver ignores mark table allocation failure. This could cause a segfault due to NULL pointer dereference in bnxt_set_mark_in_mbuf(). Fix this by checking the pointer validity before accessing it. Fixes: b87abb2e55cb ("net/bnxt: support marking packet") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_rxr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 44247d7200..9621809bd9 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -825,4 +825,7 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, uint32_t cfa_code = 0; + if (unlikely(bp->mark_table == NULL)) + return; + cfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code); if (!cfa_code) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.896400657 +0000 +++ 0057-net-bnxt-add-null-check-for-mark-table.patch 2022-02-21 15:22:44.126704204 +0000 @@ -1 +1 @@ -From 8a553bdf261f4e05a774d243bf0278ac1baf55c8 Mon Sep 17 00:00:00 2001 +From 6b722d7b3729a4cb3af2dd5356336b19e403b961 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a553bdf261f4e05a774d243bf0278ac1baf55c8 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org