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 41EF743C60 for ; Thu, 7 Mar 2024 02:33:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 38C7342E64; Thu, 7 Mar 2024 02:33:56 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id F3B2140E5A for ; Thu, 7 Mar 2024 02:33:54 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-33e1207bba1so190471f8f.1 for ; Wed, 06 Mar 2024 17:33:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775234; x=1710380034; 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=c0u0NEUdjhE4P9EGyrwBiuN2Z4IonpXtkA6ArQ0UIO8=; b=NY0702FuLEiP1M9WUBpWITirrj//rPFmyv3Fg8gZVGo/hHbASZvLoIeXBo24fIYQFu E4a9Yh4qvkSgzizqLPL274R2YMo5nBab/XQcNCXgR3Wd7Fv8ZSOFjbgxHH3hPIGJA77s IfpLE32/auJxOWGxC5KHr6HrRYHkphzbWKiNQ/QUl+citf29LADBImbHEuJMkbzoM7QF fxy8pLZ4BppOXjSM71i+w8jjFIav4RImZsFqOg0v/yVjhOp9lSQ95Fw56koXMUaoFQ25 VO7AmGDc6B1BlHKP0TDIX+oYAciPrHHgFRrXTBWyl/cOe0PoX7JEUuHBjJ08psmAyyPy Vmtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775234; x=1710380034; 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=c0u0NEUdjhE4P9EGyrwBiuN2Z4IonpXtkA6ArQ0UIO8=; b=BqIzh8Q/4qgWAb4hMUyVyxUnh0fo7ebjFLYnFxVZgYed0L6tNNNKgXrhTEqWVJ9/9X NBqCtJlrPHZnaDYdVb8aKGdLJ1zUmHoyr9FbB9s5HQFp6K0EyOyHvCtcLcGDdl0RQ3hO b8E/yFc/TQSR6fRp7X7TteUv3Nz8VjOOMblAyJ9EFaL8tJMwVhhMP8tkCOR+KjSe+W2f 30UCL3LaAppAWW9bIWLxR7wp7C6CVQDkAimwCRtvXpfkAPz/7Jo7l/cYXh+/2Wflx4Va lvdzmyDImvisRmu4QhBYrFo+Bk+cvpMZuq//LZbj43CCJcJwaV2uN1g+atukPukpdIDA 4b5A== X-Gm-Message-State: AOJu0YwTDe0PLZNcwzkS/+by6HChCBkiHwxcQnj8WmSE4+v6W8ytwnUC g+qMPU0HniaQzFaCFMz8GGpDRqda6mLWssnwWTRJPW9ngsS+d5E8OiWpQ/0p X-Google-Smtp-Source: AGHT+IEDySHgwblsNTxCRwADSDicDO/cGg5M2/i6/kmheDBaFQPuHLubKqJpMldbqNrqHkyuieiCDw== X-Received: by 2002:adf:f24e:0:b0:33d:c5c5:9bc6 with SMTP id b14-20020adff24e000000b0033dc5c59bc6mr12879554wrp.54.1709775234609; Wed, 06 Mar 2024 17:33:54 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id bj25-20020a0560001e1900b0033e49aebafasm5885211wrb.3.2024.03.06.17.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:53 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: dpdk stable Subject: patch 'app/pdump: verify strdup return' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:46 +0000 Message-Id: <20240307013159.1735343-29-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/81314db4bd41803dcb42fa96e833b2a7aeabd4e1 Thanks. Luca Boccassi --- >From 81314db4bd41803dcb42fa96e833b2a7aeabd4e1 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:11 +0000 Subject: [PATCH] app/pdump: verify strdup return [ upstream commit 32e1cb918d4bbe94c5da8d0888ce29fac1f4dbb4 ] Add verify strdup return value logic. Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing") Signed-off-by: Chengwen Feng --- app/pdump/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/pdump/main.c b/app/pdump/main.c index c6cf9d9c87..9ea8ed8943 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -171,6 +171,9 @@ parse_device_id(const char *key __rte_unused, const char *value, struct pdump_tuples *pt = extra_args; pt->device_id = strdup(value); + if (pt->device_id == NULL) + return -1; + pt->dump_by_type = DEVICE_ID; return 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:37.504951335 +0000 +++ 0029-app-pdump-verify-strdup-return.patch 2024-03-07 01:05:34.710938148 +0000 @@ -1 +1 @@ -From 32e1cb918d4bbe94c5da8d0888ce29fac1f4dbb4 Mon Sep 17 00:00:00 2001 +From 81314db4bd41803dcb42fa96e833b2a7aeabd4e1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 32e1cb918d4bbe94c5da8d0888ce29fac1f4dbb4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 7a1c7bdf60..a9205e130b 100644 +index c6cf9d9c87..9ea8ed8943 100644