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 B0D7243BA7 for ; Tue, 5 Mar 2024 16:35:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABEC542DA7; Tue, 5 Mar 2024 16:35:20 +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 43B0B42D2E 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=1709652918; 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=WIziaVZHNUoK7z+wW5d3H+DGeHkxNsvYdVT5h8Q3SpI=; b=eC2oB0EaM3R3Px+0nPAM4nLiRP+GXLqqgeWuZV4QrHfGV3V8AN6jQIhdnBEcivqKOcJO+D VuuGbg+gJVrQYXw89uzlhzIczVefJK5G6SUhh0i696/i3lhbVrL+KCFpR5jnrUVRwpSz12 nozsQ2X4Ehwaztb0lBrAkChGOHZj7D4= 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-440-HqRJcieaMreSkRM0c_UlcQ-1; Tue, 05 Mar 2024 10:35:17 -0500 X-MC-Unique: HqRJcieaMreSkRM0c_UlcQ-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 509D6891E68; Tue, 5 Mar 2024 15:35:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F33B2022EDB; Tue, 5 Mar 2024 15:35:16 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Huisong Li , dpdk stable Subject: patch 'bus/vdev: verify strdup return' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:47 +0000 Message-ID: <20240305153449.263666-14-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/fa4c241ce79dd4e001ee57355829eca098c07ca4 Thanks. Kevin --- >From fa4c241ce79dd4e001ee57355829eca098c07ca4 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:05 +0000 Subject: [PATCH] bus/vdev: verify strdup return [ upstream commit 83f275fa8124daf3a6b3e56f4b40a2be4b07a3b4 ] Add verify strdup return value logic. Fixes: 64051bb1f144 ("devargs: unify scratch buffer storage") Signed-off-by: Chengwen Feng Acked-by: Huisong Li --- drivers/bus/vdev/vdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index a8d8b2327e..272ea704e5 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -250,4 +250,8 @@ alloc_devargs(const char *name, const char *args) else devargs->data = strdup(""); + if (devargs->data == NULL) { + free(devargs); + return NULL; + } devargs->args = devargs->data; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.063799441 +0000 +++ 0014-bus-vdev-verify-strdup-return.patch 2024-03-05 14:08:54.624520696 +0000 @@ -1 +1 @@ -From 83f275fa8124daf3a6b3e56f4b40a2be4b07a3b4 Mon Sep 17 00:00:00 2001 +From fa4c241ce79dd4e001ee57355829eca098c07ca4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 83f275fa8124daf3a6b3e56f4b40a2be4b07a3b4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 7974b27295..05582f1727 100644 +index a8d8b2327e..272ea704e5 100644 @@ -21 +22 @@ -@@ -248,4 +248,8 @@ alloc_devargs(const char *name, const char *args) +@@ -250,4 +250,8 @@ alloc_devargs(const char *name, const char *args)