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 E14D543C60 for ; Thu, 7 Mar 2024 02:34:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB0C742ED8; Thu, 7 Mar 2024 02:34:14 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 40C6542E64 for ; Thu, 7 Mar 2024 02:34:13 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-41305fe71e8so3480855e9.3 for ; Wed, 06 Mar 2024 17:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775253; x=1710380053; 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=araYsOCQiudgnzFskuRJKdMsFKtQwmNeR+wWK0AZYMA=; b=KDoZ+9rZYakL5LtXw/DYks+/CcAmDLc7VgJ+K4dlB0wUv5R9UixBK733YZj1I16xfh wIGySee5e9JHtTqhrpZ0IpIVx5jO7L4HNl/ZMKtMTMaaK8WrLGG24S11slKVZMAC5nAA rD6uQaMNER4Be85du8o79pUUAp7pG9GlsZslAmJC3AlqjCn7m8INpvRgYin4OhjjB7Ud idNMlbmHowyUg/Sel4vlC8NK5zfHv9DT4JEK3wB73GyGmQ3QamKRnv++Px1uVh3hfh0G w6a21dT/WstNuWqvBJaFeQc2HvQivFyesEfBOkpmcUpEpXfy1LlW3ZMA02VkDx6qkDIW GPrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775253; x=1710380053; 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=araYsOCQiudgnzFskuRJKdMsFKtQwmNeR+wWK0AZYMA=; b=HUESc2Sg2D3pdkARK2DZC8sN/a9inRUjkw0S9bQLfiZUNFG65KhE9bZ0toLuNhd5C8 iI/42rNFkCXtw6QaGBof3CBr7fcwHRyR5rr+b3KTLSwLDfUIwmOlnoiz+4I2VXS8Z695 Kk64FcQt2/4GC/U0odEOPRg3MX9jXyuFvPjvEBz4XfpGU2JU7cuYOZiS7kKvlsvloKkz JY6ZFd8C4iK5bznEEBGo8wptnoplf79WAzq/g6TvaAzWkzgsLPYq1L86IwBEOwnEcAqn PakhPZlQa1LZOlHrm1TUBiI2gWX8OmZ7/t10NjVr2GYN0m1bZ4VsPj8q2QbvHAvJ8wp1 73NQ== X-Forwarded-Encrypted: i=1; AJvYcCXm/NiNf6gQs2hZ8dhtFBeojt2xD+6WrLvGV+PeOGqDJ/lGoChkYeEHp2aU7Py54H0MX4mDuk/8n1RcY0onqRQ= X-Gm-Message-State: AOJu0YxjwbiIWLkbft/2ChEiTUljVbSnpBjQ2g8mubJvlehd8CLUl6MU 2x9H3hOOpqS6o+gmj18RsBBnh5bOzYkWHnmpDcdJBg+E+cxyu+18 X-Google-Smtp-Source: AGHT+IGazfBJriWpUR3BpFVduhMpha5WXiTU03ZYA3WyfQT8R+aovZepTG4z8GKAE+q/3c6ws1/6CQ== X-Received: by 2002:a05:600c:1e08:b0:413:7d2:ca7f with SMTP id ay8-20020a05600c1e0800b0041307d2ca7fmr752631wmb.1.1709775252835; Wed, 06 Mar 2024 17:34:12 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id f15-20020a05600c4e8f00b00412ea52b102sm870053wmq.34.2024.03.06.17.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:34:12 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Cristian Dumitrescu , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'pipeline: fix calloc parameters' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:52 +0000 Message-Id: <20240307013159.1735343-35-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-Type: text/plain; charset=UTF-8 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/eb18df799b665566066f305efd3ddf0b2f113da2 Thanks. Luca Boccassi --- >From eb18df799b665566066f305efd3ddf0b2f113da2 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:53:58 +0000 Subject: [PATCH] pipeline: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 0594ae0c42773d62aff870df25e73394f7f0a5a5 ] gcc [1] generates warning [2] about calloc usage, because calloc parameter order is wrong, fixing it by replacing parameters. [1] gcc (GCC) 14.0.0 20231102 (experimental) [2] Compiling C object .../pipeline_rte_swx_pipeline_spec.c.o .../rte_swx_pipeline_spec.c: In function ‘pipeline_spec_parse’: ../lib/pipeline/rte_swx_pipeline_spec.c:2893:11: warning: allocation of insufficient size ‘1’ for type ‘struct pipeline_spec’ with size ‘144’ [-Walloc-size] 2893 | s = calloc(sizeof(struct pipeline_spec), 1); | ^ .../rte_swx_pipeline_spec.c: In function ‘pipeline_iospec_parse’: ../lib/pipeline/rte_swx_pipeline_spec.c:4244:11: warning: allocation of insufficient size ‘1’ for type ‘struct pipeline_iospec’ with size ‘64’ [-Walloc-size] 4244 | s = calloc(sizeof(struct pipeline_iospec), 1); | ^ Fixes: 30c4abb90942 ("pipeline: rework specification file-based pipeline build") Fixes: 54cae37ef4ef ("pipeline: support I/O specification") Signed-off-by: Ferruh Yigit Acked-by: Cristian Dumitrescu Acked-by: Morten Brørup --- lib/pipeline/rte_swx_pipeline_spec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline_spec.c b/lib/pipeline/rte_swx_pipeline_spec.c index 9116f38ed2..833436b831 100644 --- a/lib/pipeline/rte_swx_pipeline_spec.c +++ b/lib/pipeline/rte_swx_pipeline_spec.c @@ -2841,7 +2841,7 @@ pipeline_spec_parse(FILE *spec, } /* Memory allocation. */ - s = calloc(sizeof(struct pipeline_spec), 1); + s = calloc(1, sizeof(struct pipeline_spec)); if (!s) { if (err_line) *err_line = n_lines; @@ -4145,7 +4145,7 @@ pipeline_iospec_parse(FILE *spec, } /* Memory allocation. */ - s = calloc(sizeof(struct pipeline_iospec), 1); + s = calloc(1, sizeof(struct pipeline_iospec)); if (!s) { if (err_line) *err_line = n_lines; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:37.985134560 +0000 +++ 0035-pipeline-fix-calloc-parameters.patch 2024-03-07 01:05:34.746938913 +0000 @@ -1 +1 @@ -From 0594ae0c42773d62aff870df25e73394f7f0a5a5 Mon Sep 17 00:00:00 2001 +From eb18df799b665566066f305efd3ddf0b2f113da2 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 0594ae0c42773d62aff870df25e73394f7f0a5a5 ] + @@ -33 +34,0 @@ -Cc: stable@dpdk.org @@ -43 +44 @@ -index 2bba0d0524..17419e7b85 100644 +index 9116f38ed2..833436b831 100644 @@ -46 +47 @@ -@@ -2890,7 +2890,7 @@ pipeline_spec_parse(FILE *spec, +@@ -2841,7 +2841,7 @@ pipeline_spec_parse(FILE *spec, @@ -55 +56 @@ -@@ -4241,7 +4241,7 @@ pipeline_iospec_parse(FILE *spec, +@@ -4145,7 +4145,7 @@ pipeline_iospec_parse(FILE *spec,