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 A774DA034E for ; Mon, 21 Feb 2022 16:37:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A306841147; Mon, 21 Feb 2022 16:37:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B79FE40E5A for ; Mon, 21 Feb 2022 16:37:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457862; 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=BejnVXbs4kJibzravNkaFcF/df30w9RV8smGWodPCng=; b=DcpRwJ5xFF/ZuGm8EUCvHBwy1P0FoGs3tgiBLIuvFx6l1rCpireKXloQZC5VXnie3uNvfk mn/CmGiIMiZHKU7Lsz19/5jeLXvcvNNeST9TmJA9xLgaGeR/wfzup19sAvxQS/VmVMrX63 tVVjBcqzeikSl/EU7OvvvlwekcKQi/o= 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-539-uG4R9dCkMq22cW1v8VxccA-1; Mon, 21 Feb 2022 10:37:39 -0500 X-MC-Unique: uG4R9dCkMq22cW1v8VxccA-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 F0CFF180FD60; Mon, 21 Feb 2022 15:37:37 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id E611C7E131; Mon, 21 Feb 2022 15:37:36 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Fan Zhang , dpdk stable Subject: patch 'crypto/ipsec_mb: fix queue cleanup null pointer dereference' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:32 +0000 Message-Id: <20220221153625.152324-23-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/4b8475c98ed9114c5760a155b111462724314bc5 Thanks. Kevin --- >From 4b8475c98ed9114c5760a155b111462724314bc5 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 10 Dec 2021 14:09:51 +0000 Subject: [PATCH] crypto/ipsec_mb: fix queue cleanup null pointer dereference [ upstream commit 581c39b1cb7d82d301a8ec6a16778bcf6ee11c7c ] The qp was being used in the cleanup without checking if it was non NULL. A check is now added to verify qp is non NULL before use. Coverity issue: 374375 Fixes: c75542ae4200 ("crypto/ipsec_mb: introduce IPsec_mb framework") Signed-off-by: Ciara Power Acked-by: Fan Zhang --- drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c index 6efa417d67..1ebd23e8f0 100644 --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c @@ -286,4 +286,6 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, qp_setup_cleanup: + if (qp == NULL) + return ret; #if IMB_VERSION(1, 1, 0) > IMB_VERSION_NUM if (qp->mb_mgr) @@ -295,6 +297,5 @@ qp_setup_cleanup: rte_memzone_free(qp->mb_mgr_mz); #endif - if (qp) - rte_free(qp); + rte_free(qp); return ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.157391035 +0000 +++ 0023-crypto-ipsec_mb-fix-queue-cleanup-null-pointer-deref.patch 2022-02-21 15:22:44.044704019 +0000 @@ -1 +1 @@ -From 581c39b1cb7d82d301a8ec6a16778bcf6ee11c7c Mon Sep 17 00:00:00 2001 +From 4b8475c98ed9114c5760a155b111462724314bc5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 581c39b1cb7d82d301a8ec6a16778bcf6ee11c7c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org