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 38A7743C60 for ; Thu, 7 Mar 2024 02:33:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FE5742E9C; Thu, 7 Mar 2024 02:33:40 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 414C040261 for ; Thu, 7 Mar 2024 02:33:38 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-412ea23a750so2346525e9.0 for ; Wed, 06 Mar 2024 17:33:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775218; x=1710380018; 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=hsPM49hkxls09C5Ry/kv6XNuO4+YfHfGbbryQQSGJOo=; b=RCyc9pOdf8jyXHnpHCid49O2n8o7Wa4DbdFPhiH8prqPQd/RsNljwZKcWtS+5iGmGJ jOAiDlgN4lLat4C0UhMSsYO5XdlieRsqhnNLN1VHTNWpFLgIk8RJlS/GrRLwimSQL1aZ lL8BXlo98b2aBmCTJM34S7ixIl3vTpj18QUoKNifvI/YlA6wegcuJcVu7UWkwR74rNa6 x6kBuRubNV4JE/aPvmesBK94m3hvn0Pv7E74dOvDS8wizT0+thnN8216FWwDRG/GVYLp Wll5B5X/VYt+BZZicxWcq+2L00CAn4hl5C0y4ZzoE0LmUisuaY2lyCJUsP8XAHWkU8n+ Vngw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775218; x=1710380018; 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=hsPM49hkxls09C5Ry/kv6XNuO4+YfHfGbbryQQSGJOo=; b=mFNhUX3hTuszp20g5aAndc2wMVxsIHozgt1gTSAUjrh8G/kBrheXYHbaVWYOuoTMFR nkM/4p72yBPd+tjF9uDzrpjJRUMGb97vbxBeWxAhmtIzCc12JB8pBYvsJhdrfyyhWOLd 1TyresG+Td7BFVrO3W00631T31xTto5fxI38Vz6ESiGUQVsgeEvjtWgValrFVsfrZurt 3wwxH36X6FQ0gYB0aB80MqyI4CFeZNecnnw1sJxqd4vvCFxx/xgaNea7N8m4XQ0KrB0r SKOS4wrSdCrKmeoEGTwVBB5ziNymOMSyU8NOklCY1MvO3L2DFcnyYp5iWxDu1oAU4N4t Okfg== X-Forwarded-Encrypted: i=1; AJvYcCUUe5/JL1PJw7wpFDVbxwjyXkjzealb/glXtuuak4KFXgIio7L6eyBo2YjtnUK+syQ5S7FI5BhWTYDQywCZvMk= X-Gm-Message-State: AOJu0YyheNhVzKxEq5zCPxgFNknzn1FPWesdS6n7n+m+XdEOrELPd3IM Epo2amt2rMTNljMNyhGv+MWDAmoF7DIxye+n/++hICW8qhfaeuiOhDKwu05T X-Google-Smtp-Source: AGHT+IFTP4cUWppjWqSWtNUvfMorLRhdoH2y0KRJmFuv7rv0hBk+CiAJmZs3jNw93mojeKhpsSkfNg== X-Received: by 2002:a05:600c:4f01:b0:412:a015:9411 with SMTP id l1-20020a05600c4f0100b00412a0159411mr45237wmq.6.1709775217918; Wed, 06 Mar 2024 17:33:37 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id n6-20020a056000170600b0033e45930f35sm7257767wrc.6.2024.03.06.17.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:37 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Huisong Li , dpdk stable Subject: patch 'bus/vdev: verify strdup return' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:41 +0000 Message-Id: <20240307013159.1735343-24-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/915eda4e5ab1881343703289e2dde4f030e0c596 Thanks. Luca Boccassi --- >From 915eda4e5ab1881343703289e2dde4f030e0c596 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 7974b27295..05582f1727 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -247,6 +247,10 @@ alloc_devargs(const char *name, const char *args) devargs->data = strdup(args); else devargs->data = strdup(""); + if (devargs->data == NULL) { + free(devargs); + return NULL; + } devargs->args = devargs->data; ret = strlcpy(devargs->name, name, sizeof(devargs->name)); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:37.064664535 +0000 +++ 0024-bus-vdev-verify-strdup-return.patch 2024-03-07 01:05:34.706938064 +0000 @@ -1 +1 @@ -From 83f275fa8124daf3a6b3e56f4b40a2be4b07a3b4 Mon Sep 17 00:00:00 2001 +From 915eda4e5ab1881343703289e2dde4f030e0c596 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 83f275fa8124daf3a6b3e56f4b40a2be4b07a3b4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org