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 6DDEFA034E for ; Mon, 21 Feb 2022 16:37:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65CD84013F; Mon, 21 Feb 2022 16:37:42 +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 8CE864013F for ; Mon, 21 Feb 2022 16:37:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457861; 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=S19FyGpXW6AG7AQRQTfc1dJyUsGi++UmH+l7t6BsndY=; b=dPq16A+0A9HEF91KYBQ9ewGYNQMZ3K7GrApISJ+cggFiDrkqW9O4JDHdpY7fS0Zw03d3eF RDJ6spbZ96b3MouzmzbZzKE4kYIjROzZHcXlomHZpKrTsFdZ+T28nzU0NFbO7dCRXfTGiT mY2G0EzLX8lefWegCzRXvF3kXKxOZoM= 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-507-o1ZGt9ZGPvqdglOnoOE68Q-1; Mon, 21 Feb 2022 10:37:37 -0500 X-MC-Unique: o1ZGt9ZGPvqdglOnoOE68Q-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 A29E5180FD62; Mon, 21 Feb 2022 15:37:36 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BAE87E131; Mon, 21 Feb 2022 15:37:35 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Fan Zhang , dpdk stable Subject: patch 'crypto/ipsec_mb: fix queue setup null pointer dereference' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:31 +0000 Message-Id: <20220221153625.152324-22-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/07ee507051541ff714ad08fe1adffeb9304b8f03 Thanks. Kevin --- >From 07ee507051541ff714ad08fe1adffeb9304b8f03 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 10 Dec 2021 14:09:50 +0000 Subject: [PATCH] crypto/ipsec_mb: fix queue setup null pointer dereference [ upstream commit f51e40d1bf5efe7e659110613c63f1beb740d203 ] When setting up a qp in a secondary process, the local qp pointer is set to the stored device qp, configured by the primary process for that device, but only if that device qp is not NULL. If the device qp was not set up correctly by the primary process and has a NULL value, the local qp variable stays at the default initialised value, NULL. This causes a NULL pointer dereference later in the function when using the qp value. This is fixed by always setting the local qp to the value of the device qp stored, and then checking if qp is NULL, returning an error if it is. Coverity issue: 374382 Fixes: 72a169278a56 ("crypto/ipsec_mb: support multi-process") Signed-off-by: Ciara Power Acked-by: Fan Zhang --- drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c index 189262c4ad..6efa417d67 100644 --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c @@ -222,6 +222,9 @@ ipsec_mb_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, return -EINVAL; #endif - if (dev->data->queue_pairs[qp_id] != NULL) - qp = dev->data->queue_pairs[qp_id]; + qp = dev->data->queue_pairs[qp_id]; + if (qp == NULL) { + IPSEC_MB_LOG(ERR, "Primary process hasn't configured device qp."); + return -EINVAL; + } } else { /* Free memory prior to re-allocation if needed. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.139168043 +0000 +++ 0022-crypto-ipsec_mb-fix-queue-setup-null-pointer-derefer.patch 2022-02-21 15:22:44.044704019 +0000 @@ -1 +1 @@ -From f51e40d1bf5efe7e659110613c63f1beb740d203 Mon Sep 17 00:00:00 2001 +From 07ee507051541ff714ad08fe1adffeb9304b8f03 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f51e40d1bf5efe7e659110613c63f1beb740d203 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org