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 F0FF543C60 for ; Thu, 7 Mar 2024 02:33:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E55D840E5A; Thu, 7 Mar 2024 02:33:38 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id DD02F42E20 for ; Thu, 7 Mar 2024 02:33:36 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4130e293686so2313035e9.3 for ; Wed, 06 Mar 2024 17:33:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775216; x=1710380016; 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=VXTwFgYE6cvH7iLdJ2ZlJQof3Agw30Uo+u2eRKP27EQ=; b=DPKO1XGj06EMBKIOeqQsGkI22S9yBgYAVNxPtk8hrHQL/Tq/26VZXJWAp5i+4/+NV+ Kmz4JoDrMsmNNXk3VejbxkYmX0iOYeSlFrsPdYug/r5i64kp9RO2zS1gUBl2BYpNzR5L 7apsV0XXKS6Rm7ew37z7DNRoguF/kyUHlsytYq2/x/7PiaijVgeStvmUgLhMXQwKSl28 K+fprvG6SDtlMICEAb7cOqEiMXipT3R47iiGJZglIemyrlQ9t+ZyPaiEphkZg17GiMFF OnaJ4/B9o4dV3u2xaFw9bAClWASJkEOdoCc2w9sJzGeaKXd+Muo9uL3VmvJqGi5ChoUE aBFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775216; x=1710380016; 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=VXTwFgYE6cvH7iLdJ2ZlJQof3Agw30Uo+u2eRKP27EQ=; b=RjWzpdeztSo/TzY0TVpJleHFyqPW2Lw94iEaKokwXzDXG9Gl3XioYdxP9R8lKTyw45 hOtlXSptI+VXVN0HW6XzC75Dihw2tmVPyzOsR+ZK/P9JvKCKwMEmVfLBnF0AP++eKjLU 61B/N57itgL0Ln3Fcth+jrXicxHBgNHEJmgHtjJoPlk8fryfhqdLrE+JrKXVWI2Tn4G+ s+ti3Hgucu4Kskb18ViicW0aIiAEttio2auWHYPUkoW6/kKKZKWiCD1kWslxgBWa5Hb4 wgfKBSwcVuszw8UARV828x+PlbcHfmXkdFLmDlKplhzS5iUT90ypDwYBPVJ0d4Lj5ARA ytuA== X-Forwarded-Encrypted: i=1; AJvYcCX/yCCWC6JPRdwv6KL3MitUqWW6LcFDXGSzpHkhJF7pYXgpjtHZXN7LsCkn/qdRHuktDK0LAFdbnziEyx72y0w= X-Gm-Message-State: AOJu0YzJPnZMhvYnefktykil+tuWwPH5ZnNq2QsM1Fg7uiPJMsDgqGUS F1AvDHZbf5y3KD8VJR6KjHY3Ig35tZEgz9GcGKoWPpcZsxSmtLvQ X-Google-Smtp-Source: AGHT+IG14gBV7s2RokJQikQ0e6S0m9HXYVOmfPfN4H+gIpchDvHBetzwZtKMP9qcjBN9nklH0xhIrQ== X-Received: by 2002:a05:600c:4ecf:b0:412:b457:6303 with SMTP id g15-20020a05600c4ecf00b00412b4576303mr14903532wmq.21.1709775216514; Wed, 06 Mar 2024 17:33:36 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id n16-20020a05600c501000b00412e290db9fsm870085wmr.26.2024.03.06.17.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:35 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Sachin Saxena , dpdk stable Subject: patch 'bus/fslmc: verify strdup return' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:40 +0000 Message-Id: <20240307013159.1735343-23-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/f0becad29466ec4259d3b3a3f1f3c5d489db9e81 Thanks. Luca Boccassi --- >From f0becad29466ec4259d3b3a3f1f3c5d489db9e81 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 57bfb5111a..89f0f329c0 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -634,6 +634,10 @@ 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="); 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.969041857 +0000 +++ 0023-bus-fslmc-verify-strdup-return.patch 2024-03-07 01:05:34.702937979 +0000 @@ -1 +1 @@ -From 180d52bc7de2395ce9f4e5a707f4d8bb52be2fe4 Mon Sep 17 00:00:00 2001 +From f0becad29466ec4259d3b3a3f1f3c5d489db9e81 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 57bfb5111a..89f0f329c0 100644 @@ -21 +22 @@ -@@ -635,6 +635,10 @@ fslmc_bus_dev_iterate(const void *start, const char *str, +@@ -634,6 +634,10 @@ fslmc_bus_dev_iterate(const void *start, const char *str,