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 21A3143C60 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 1854F42E64; Thu, 7 Mar 2024 02:33:36 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 0B08D40E5A for ; Thu, 7 Mar 2024 02:33:34 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-33dcd8dec88so149924f8f.1 for ; Wed, 06 Mar 2024 17:33:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775213; x=1710380013; 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=+ApTwCVXRKRqxlUIMH8O98swufjuo+7AzHKgNb2DXhY=; b=cOjC/KUv+wT8C+eOQG9X3zioJhD6YWJfPASOOykcamuPZ+Sa5iN6SueYFRHR6HpZPP /Rbo6PdTChIB0FL0mjPEsGIVC7nyLQnuTE5lVziRqiccnDlTfEeKCk21jZ5Qv6eL9HtA ICia++6cEP8S26FrLcGjTn8U+H0s813huFaWiYUYrRNEI0N13GhZBJldYh3vjYp4J1k5 ZaAs63dOp9ZRciCeCXcfHlt7SpQeyNm44OwC3RWF1aUpPdnEMiixYFIiV/aTal1OjQSj hRxI3IC6MM5wUnaYvDUfov8D8opdqg9LY2aGvmqZyRrhDvdFEWbH1JgVeV7779ldwkiq yBKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775213; x=1710380013; 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=+ApTwCVXRKRqxlUIMH8O98swufjuo+7AzHKgNb2DXhY=; b=kgeGjyctItAJV9U8YSCNL1W7M3vdwWMTZooR5Tk43dIPTvy1tD99HpnP00P+hZmiED 852yI4wUoY0HM7bLl/zGuoq8uPoPvUHVny8ExHhIwMpAz/bf7qNPISQEidPJjdx8srkx +heLywgbMkp0Oypn24naN4sPmzHi14PKIDb8+rDKn3bD2hAR4A2HayVYLNHzNuK4PZ22 ibPs/ZMxJQyW7TZJzk4CKFDuLk5m+ow87sdpKTsdCPGzoxcT0e88vbKPvcNis4yoVCMJ qHxkR2P+1I1cjQny+0TPXH/Rqk9BXHL6Gv6SDTn0H0wyoysgcSbPQwoZnjNGkYp3druu Hduw== X-Gm-Message-State: AOJu0YxdFvkC4iBBh24D2TKEF2yEMNGZFjN3N02n0WcWlhYNssK0qPYM gECJJZ28VVuIJ2ZZj/psyTddtqljZOTvY4UcYVHirihhfSCJ9di8 X-Google-Smtp-Source: AGHT+IEphWRBwWH2NKxnQKICiHg+N3AQXlHw2Hwq9rduj7chfxQ5TPkcudVo5h6Bwc9QaPIXtGI2Sg== X-Received: by 2002:a5d:548f:0:b0:33e:652b:d6cf with SMTP id h15-20020a5d548f000000b0033e652bd6cfmr67988wrv.29.1709775213547; Wed, 06 Mar 2024 17:33:33 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ck4-20020a5d5e84000000b0033e2b9f647asm13238216wrb.31.2024.03.06.17.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:32 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: dpdk stable Subject: patch 'eal: verify strdup return' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:38 +0000 Message-Id: <20240307013159.1735343-21-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/10d9146d6d3a777e510633cbd31f4c94aa7a685e Thanks. Luca Boccassi --- >From 10d9146d6d3a777e510633cbd31f4c94aa7a685e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:02 +0000 Subject: [PATCH] eal: verify strdup return [ upstream commit 5821a384a4ca611e0f67786400b9f5b18f34a416 ] Add verify strdup() return value logic. Fixes: 293c53d8b23c ("eal: add telemetry callbacks") Fixes: 0d0f478d0483 ("eal/linux: add uevent parse and process") Signed-off-by: Chengwen Feng --- lib/eal/common/eal_common_options.c | 24 ++++++++++++++++++++++-- lib/eal/linux/eal_dev.c | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 43b16805da..18a50f7452 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -225,6 +225,8 @@ eal_save_args(int argc, char **argv) if (strcmp(argv[i], "--") == 0) break; eal_args[i] = strdup(argv[i]); + if (eal_args[i] == NULL) + goto error; } eal_args[i++] = NULL; /* always finish with NULL */ @@ -234,13 +236,31 @@ eal_save_args(int argc, char **argv) eal_app_args = calloc(argc - i + 1, sizeof(*eal_args)); if (eal_app_args == NULL) - return -1; + goto error; - for (j = 0; i < argc; j++, i++) + for (j = 0; i < argc; j++, i++) { eal_app_args[j] = strdup(argv[i]); + if (eal_app_args[j] == NULL) + goto error; + } eal_app_args[j] = NULL; return 0; + +error: + if (eal_app_args != NULL) { + i = 0; + while (eal_app_args[i] != NULL) + free(eal_app_args[i++]); + free(eal_app_args); + eal_app_args = NULL; + } + i = 0; + while (eal_args[i] != NULL) + free(eal_args[i++]); + free(eal_args); + eal_args = NULL; + return -1; } #endif diff --git a/lib/eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c index ac76f6174d..c0ba98852b 100644 --- a/lib/eal/linux/eal_dev.c +++ b/lib/eal/linux/eal_dev.c @@ -182,6 +182,8 @@ dev_uev_parse(const char *buf, struct rte_dev_event *event, int length) i += 14; strlcpy(pci_slot_name, buf, sizeof(subsystem)); event->devname = strdup(pci_slot_name); + if (event->devname == NULL) + return -1; } for (; i < length; i++) { if (*buf == '\0') -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:36.812377810 +0000 +++ 0021-eal-verify-strdup-return.patch 2024-03-07 01:05:34.702937979 +0000 @@ -1 +1 @@ -From 5821a384a4ca611e0f67786400b9f5b18f34a416 Mon Sep 17 00:00:00 2001 +From 10d9146d6d3a777e510633cbd31f4c94aa7a685e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5821a384a4ca611e0f67786400b9f5b18f34a416 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d9748076b4..e541f07939 100644 +index 43b16805da..18a50f7452 100644 @@ -22 +23 @@ -@@ -226,6 +226,8 @@ eal_save_args(int argc, char **argv) +@@ -225,6 +225,8 @@ eal_save_args(int argc, char **argv) @@ -31 +32 @@ -@@ -235,13 +237,31 @@ eal_save_args(int argc, char **argv) +@@ -234,13 +236,31 @@ eal_save_args(int argc, char **argv) @@ -66 +67 @@ -index e678dce6c7..fff4e8fa83 100644 +index ac76f6174d..c0ba98852b 100644