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 3819A43829 for ; Tue, 5 Mar 2024 16:35:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31A4842DCA; Tue, 5 Mar 2024 16:35:24 +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 3461942D2E for ; Tue, 5 Mar 2024 16:35:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652921; 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=BJ2zZ9NbM3nWgYhDg6cPILogYHhsf8Na8Juianfmnug=; b=JsJQNcurQn9a2yC7cKd2Zp+ErndrWg6oJWYh6cFvrXjmGptIZjINff644WS+h6vXCXxvS0 pbFdgqAsdzv19r+321zinqqlBE6oCW+H2giXDb1uPzGvgnY+4f8zx6IAQglh7Q6nFQ7f3M bdlIC97mca2cp4tff7y3Yy8/PTV7t4g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-0O2OEV9eN06cksoGWcNAcw-1; Tue, 05 Mar 2024 10:35:18 -0500 X-MC-Unique: 0O2OEV9eN06cksoGWcNAcw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 59F49101A523; Tue, 5 Mar 2024 15:35:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFE09200B01D; Tue, 5 Mar 2024 15:35:17 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'dma/idxd: verify strdup return' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:48 +0000 Message-ID: <20240305153449.263666-15-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.7 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/24. 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/93cc8c419ff1ea0dc30c2045b75f86ade33c1f1e Thanks. Kevin --- >From 93cc8c419ff1ea0dc30c2045b75f86ade33c1f1e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:06 +0000 Subject: [PATCH] dma/idxd: verify strdup return [ upstream commit 83cfa2cbf3f3fb78e2f2dd228109adcb38e18a5c ] Add verify strdup return value logic. Fixes: e888bb1278c6 ("dma/idxd: add bus device probing") Signed-off-by: Chengwen Feng --- drivers/dma/idxd/idxd_bus.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c index 594b3e1d5a..7aaccd50f4 100644 --- a/drivers/dma/idxd/idxd_bus.c +++ b/drivers/dma/idxd/idxd_bus.c @@ -249,7 +249,13 @@ is_for_this_process_use(const char *name) { char *runtime_dir = strdup(rte_eal_get_runtime_dir()); - char *prefix = basename(runtime_dir); - int prefixlen = strlen(prefix); int retval = 0; + int prefixlen; + char *prefix; + + if (runtime_dir == NULL) + return retval; + + prefix = basename(runtime_dir); + prefixlen = strlen(prefix); if (strncmp(name, "dpdk_", 5) == 0) -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.084369232 +0000 +++ 0015-dma-idxd-verify-strdup-return.patch 2024-03-05 14:08:54.625520699 +0000 @@ -1 +1 @@ -From 83cfa2cbf3f3fb78e2f2dd228109adcb38e18a5c Mon Sep 17 00:00:00 2001 +From 93cc8c419ff1ea0dc30c2045b75f86ade33c1f1e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 83cfa2cbf3f3fb78e2f2dd228109adcb38e18a5c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 3b2d4c2b65..ba8076715d 100644 +index 594b3e1d5a..7aaccd50f4 100644 @@ -20 +21 @@ -@@ -262,7 +262,13 @@ is_for_this_process_use(struct rte_dsa_device *dev, const char *name) +@@ -249,7 +249,13 @@ is_for_this_process_use(const char *name)