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 B149D43C60 for ; Thu, 7 Mar 2024 02:33:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A849F40E5A; Thu, 7 Mar 2024 02:33:36 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 59DBA40E5A for ; Thu, 7 Mar 2024 02:33:35 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-412f988b601so3426315e9.0 for ; Wed, 06 Mar 2024 17:33:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775215; x=1710380015; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UpqgUkhlx2h5JqzTnoNJriusMCQW3kLHFsSDi5kD/w4=; b=D3Qzxnwyp0ra+X2Rbix48q04wO7jXwBUA2BjPe4iYBlWOnNT2OvjQwrW7Os+rbgHZC UeNMyBYkRE1kz4wx4FWZV07v9ZI+/NEySgl4kIx+yw7SaSXeodUgDzdJ3M3YoEyJOZ9c DndjikViyP6M4cxHR0A4efciincP+J33M4IIVAL9tVbagt4xoRfgC4Us0N0rxy4UXLVE vEtMlccF6TfgBLCTyc7btHvXYckvUetvty36w52xz67hW5tNM1aJoyni+Da/2SpVlkul F2Dcznkx+Tzi+xeO2Jwuettdges0U2FRW4fZkyqRjlRQwE5ZEF9nnobyU7FA45/39XRC gZTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775215; x=1710380015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UpqgUkhlx2h5JqzTnoNJriusMCQW3kLHFsSDi5kD/w4=; b=u7C8/0Iy4gQGrIeHlvx1vchKBrHEq3UTxZin4cbVQdpVkWrF4euK/xXjdAWbjeuLsV 9OTnbmfND+KxtYcJ792sXk9THDflAxARxRJ0QnyyqxKzXU+Gwoj6HtyIIw6laYWStBjO i+BxPSW2NPxZZVrFXSsGF8qhunWXBifAGR/r0xuUp3Gltn4wnEK6LEDDFWMQJAGEWEJ4 chASptmBrtj18RtVyB4NED34mMBoRCOWve4B0FzwrkSByuGlh56m3bRFZMhfAA5qxgjJ fCZv/+Gp9Sajqiy4P4wxPQ6OlzLv8eL1M42KaeYwDisOCFZkATrlYczwyIM9PXDhx8AC R0AA== X-Forwarded-Encrypted: i=1; AJvYcCUfOBlwtUaTLWN6bDG/mI6mCDjVjECIn7HYMl07ZGuH8X7jfNgKMBd3fDAk4En+dL7fAWIQoBUBVwo9qlYX0j4= X-Gm-Message-State: AOJu0YzQ7GQrRc27vmEUOR7by7znAFxGmeFMqFsaf200qFw40HD0CQVb 7pOvO28twmRODG8opqs56fwiumWgFqpFdvfCs1IQgG2LsGzOV05m X-Google-Smtp-Source: AGHT+IGLIrB65OckyxkmzNyhKK4MzlHb8f5oq0Bppxj4QrjEDP0dkWv9U+GbOqNoZirGlUuOjm/Jzg== X-Received: by 2002:a05:600c:3554:b0:412:efc8:299b with SMTP id i20-20020a05600c355400b00412efc8299bmr3568466wmq.39.1709775215003; Wed, 06 Mar 2024 17:33:35 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id fl9-20020a05600c0b8900b00412eff2eb5bsm896625wmb.13.2024.03.06.17.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:34 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Sachin Saxena , dpdk stable Subject: patch 'bus/dpaa: verify strdup return' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:39 +0000 Message-Id: <20240307013159.1735343-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8d6011441b8325a3768ab9f51bd42c99831f1be6 Thanks. Luca Boccassi --- >From 8d6011441b8325a3768ab9f51bd42c99831f1be6 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:03 +0000 Subject: [PATCH] bus/dpaa: verify strdup return [ upstream commit 2729fa6654b328bb4b9a0ede6d1e1019bd6caf0c ] Add verify strdup return value logic. Fixes: e79df833d3f6 ("bus/dpaa: support hotplug ops") Signed-off-by: Chengwen Feng Acked-by: Sachin Saxena --- drivers/bus/dpaa/dpaa_bus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index e57159f5d8..a67f5c9ab5 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -791,6 +791,10 @@ dpaa_bus_dev_iterate(const void *start, const char *str, /* Now that name=device_name format is available, split */ dup = strdup(str); + if (dup == NULL) { + DPAA_BUS_DEBUG("Dup string (%s) failed!\n", str); + return NULL; + } dev_name = dup + strlen("name="); if (start != NULL) { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:36.894653381 +0000 +++ 0022-bus-dpaa-verify-strdup-return.patch 2024-03-07 01:05:34.702937979 +0000 @@ -1 +1 @@ -From 2729fa6654b328bb4b9a0ede6d1e1019bd6caf0c Mon Sep 17 00:00:00 2001 +From 8d6011441b8325a3768ab9f51bd42c99831f1be6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2729fa6654b328bb4b9a0ede6d1e1019bd6caf0c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 46473603c8..5d4352bb3c 100644 +index e57159f5d8..a67f5c9ab5 100644 @@ -21 +22 @@ -@@ -792,6 +792,10 @@ dpaa_bus_dev_iterate(const void *start, const char *str, +@@ -791,6 +791,10 @@ dpaa_bus_dev_iterate(const void *start, const char *str,