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 DA40D43829 for ; Tue, 5 Mar 2024 16:35:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CDCA542DA6; Tue, 5 Mar 2024 16:35:21 +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 AEF23410FB for ; Tue, 5 Mar 2024 16:35:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652919; 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=E+POOjDFVYjDD6V5P8bmvlBjLjWmuVKgTrf28FlXDYw=; b=a8uN0yq4203m9H6L2K9naFnuK/TYaysiJpkGofGGbI6vcxU1x0/SdW849uoCqOdh61sMLA IimVUQMoX/IM2y/KpmAwZ9f3URhX6XCbhNJjn2GStffwENefTpnHlwuUjd3x7Fpqi+8P96 dC0WdxehrYfDZ9cJmdjBY6W2g4ZEWl0= 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-310-RFJ3DZzlOmOsXMYUx0A_1Q-1; Tue, 05 Mar 2024 10:35:16 -0500 X-MC-Unique: RFJ3DZzlOmOsXMYUx0A_1Q-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 D8A62185A789; Tue, 5 Mar 2024 15:35:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0DD2200AFA2; Tue, 5 Mar 2024 15:35:14 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Sachin Saxena , dpdk stable Subject: patch 'bus/fslmc: verify strdup return' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:46 +0000 Message-ID: <20240305153449.263666-13-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/5a753bd6ddef093ad394bb8859db1cc57656bebe Thanks. Kevin --- >From 5a753bd6ddef093ad394bb8859db1cc57656bebe Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:04 +0000 Subject: [PATCH] bus/fslmc: verify strdup return [ upstream commit 180d52bc7de2395ce9f4e5a707f4d8bb52be2fe4 ] Add verify strdup return value logic. Fixes: e67a61614d0b ("bus/fslmc: support device iteration") Signed-off-by: Chengwen Feng Acked-by: Sachin Saxena --- drivers/bus/fslmc/fslmc_bus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 53fd75539e..2993af2563 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -639,4 +639,8 @@ fslmc_bus_dev_iterate(const void *start, const char *str, /* Now that name=device_name format is available, split */ dup = strdup(str); + if (dup == NULL) { + DPAA2_BUS_DEBUG("Dup string (%s) failed!\n", str); + return NULL; + } dev_name = dup + strlen("name="); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.043511419 +0000 +++ 0013-bus-fslmc-verify-strdup-return.patch 2024-03-05 14:08:54.623520694 +0000 @@ -1 +1 @@ -From 180d52bc7de2395ce9f4e5a707f4d8bb52be2fe4 Mon Sep 17 00:00:00 2001 +From 5a753bd6ddef093ad394bb8859db1cc57656bebe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 180d52bc7de2395ce9f4e5a707f4d8bb52be2fe4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index b1af47ca7d..c155f4a2fd 100644 +index 53fd75539e..2993af2563 100644 @@ -21 +22 @@ -@@ -636,4 +636,8 @@ fslmc_bus_dev_iterate(const void *start, const char *str, +@@ -639,4 +639,8 @@ fslmc_bus_dev_iterate(const void *start, const char *str,