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 DB22D43829 for ; Tue, 5 Mar 2024 16:35:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5681415D7; Tue, 5 Mar 2024 16:35:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 09136402AF for ; Tue, 5 Mar 2024 16:35:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p9aKdRjNUgcN/xt5Txjx13q9HebuPZgNRUNjAq/CA/0=; b=YzgCVzdDUE32H2leZf6o4IegYNUk0OmJ0mpGpEWQ+FKB1RFdJcgIKYpzs9OKA0zri0G7Bg 49RfHkwOAWB1C44Z1mdi1gYauwG8WiBPZCBkZSRwxFz9CpoEoTLz2KWrGdLqhqRu9C98uG VEh98j7QcpQqkpzE15AA3E8KUh7XH90= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-74-nyGpmr5MMvOgCt9WPuyI3A-1; Tue, 05 Mar 2024 10:35:29 -0500 X-MC-Unique: nyGpmr5MMvOgCt9WPuyI3A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7CC76891E6A; Tue, 5 Mar 2024 15:35:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80AD22022BCC; Tue, 5 Mar 2024 15:35:28 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Chaoyong He , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'net/nfp: fix calloc parameters' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:58 +0000 Message-ID: <20240305153449.263666-25-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 21.11.7 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/11/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/8fd1646a47739c84d4c029fea79cb5048eabd270 Thanks. Kevin --- >From 8fd1646a47739c84d4c029fea79cb5048eabd270 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:53:59 +0000 Subject: [PATCH] net/nfp: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 0352f47a3bf923574afe17e822af58bedc7ead49 ] 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 .../net_nfp_nfpcore_nfp_mutex.c.o .../net/nfp/nfpcore/nfp_mutex.c: In function ‘nfp_cpp_mutex_alloc’: ../drivers/net/nfp/nfpcore/nfp_mutex.c:171:15: warning: allocation of insufficient size ‘1’ for type ‘struct nfp_cpp_mutex’ with size ‘48’ [-Walloc-size] 171 | mutex = calloc(sizeof(*mutex), 1); | ^ Fixes: c7e9729da6b5 ("net/nfp: support CPP") Signed-off-by: Ferruh Yigit Acked-by: Chaoyong He Acked-by: Morten Brørup --- drivers/net/nfp/nfpcore/nfp_mutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c index 318c5800d7..b9de16e889 100644 --- a/drivers/net/nfp/nfpcore/nfp_mutex.c +++ b/drivers/net/nfp/nfpcore/nfp_mutex.c @@ -152,5 +152,5 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target, return NFP_ERRPTR(EEXIST); - mutex = calloc(sizeof(*mutex), 1); + mutex = calloc(1, sizeof(*mutex)); if (!mutex) return NFP_ERRPTR(ENOMEM); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.298043154 +0000 +++ 0025-net-nfp-fix-calloc-parameters.patch 2024-03-05 14:08:54.639520736 +0000 @@ -1 +1 @@ -From 0352f47a3bf923574afe17e822af58bedc7ead49 Mon Sep 17 00:00:00 2001 +From 8fd1646a47739c84d4c029fea79cb5048eabd270 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 0352f47a3bf923574afe17e822af58bedc7ead49 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 3c10c7a090..edb78dfdc9 100644 +index 318c5800d7..b9de16e889 100644 @@ -38,2 +39,2 @@ -@@ -169,5 +169,5 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, - return NULL; +@@ -152,5 +152,5 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target, + return NFP_ERRPTR(EEXIST); @@ -43,2 +44,2 @@ - if (mutex == NULL) - return NULL; + if (!mutex) + return NFP_ERRPTR(ENOMEM);