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 6F7BD45804 for ; Fri, 23 Aug 2024 18:22:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 693814336F; Fri, 23 Aug 2024 18:22:48 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 29543402BE for ; Fri, 23 Aug 2024 18:22:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430165; 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=Y6u0+84yOupsAMSUjo/uYd+/bbvebl3jnqI1pC9GymE=; b=iewjZSkZiaXQ9JdLWPZ1qwJIFIFX/mMG4MieL6dgodVtb7TJUxQ/XW5WZUc2i0zQY8KgoK xDKvolUSHRxPu4DG2kLqQNvhorIsum2T1hDpKa3GkcF7P125k/ft/uofj2cBZdpC9D+zbd rRifPSobTTkxHoi97A/UFwUUoygLbjg= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-Vj2zJAlkMI6hEfo7uESyqQ-1; Fri, 23 Aug 2024 12:22:40 -0400 X-MC-Unique: Vj2zJAlkMI6hEfo7uESyqQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7448B19560B4; Fri, 23 Aug 2024 16:22:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8CC551956053; Fri, 23 Aug 2024 16:22:37 +0000 (UTC) From: Kevin Traynor To: Jacob Keller Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix size when allocating children arrays' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:33 +0100 Message-ID: <20240823161929.1004778-85-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/bc355f5741338ff94e43f55a96574455c2d168a8 Thanks. Kevin --- >From bc355f5741338ff94e43f55a96574455c2d168a8 Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Wed, 26 Jun 2024 12:41:08 +0100 Subject: [PATCH] net/ice/base: fix size when allocating children arrays [ upstream commit 3072e5e2da9870d8cb119f15482eae9d9fb51e98 ] The ice_sched_add_root_node() and ice_sched_add_node() functions have comments to suppress Coverity warnings about a suspicious sizeof used when allocating the children array of an struct ice_sched_node. The size is calculated using the size of the scheduler node, which overallocates the array by a significant amount. Fix the code to correctly calculate the size by using *root->children and *node->children respectively. This saves some memory and allows us to drop the Coverity suppression comments. Fixes: 93e84b1bfc92 ("net/ice/base: add basic Tx scheduler") Signed-off-by: Jacob Keller Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_sched.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index 92451c2f83..2944a6fd48 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -29,7 +29,6 @@ ice_sched_add_root_node(struct ice_port_info *pi, return ICE_ERR_NO_MEMORY; - /* coverity[suspicious_sizeof] */ root->children = (struct ice_sched_node **) - ice_calloc(hw, hw->max_children[0], sizeof(*root)); + ice_calloc(hw, hw->max_children[0], sizeof(*root->children)); if (!root->children) { ice_free(hw, root); @@ -181,7 +180,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer, return ICE_ERR_NO_MEMORY; if (hw->max_children[layer]) { - /* coverity[suspicious_sizeof] */ node->children = (struct ice_sched_node **) - ice_calloc(hw, hw->max_children[layer], sizeof(*node)); + ice_calloc(hw, hw->max_children[layer], + sizeof(*node->children)); if (!node->children) { ice_free(hw, node); -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.249654902 +0100 +++ 0085-net-ice-base-fix-size-when-allocating-children-array.patch 2024-08-23 17:18:09.767430269 +0100 @@ -1 +1 @@ -From 3072e5e2da9870d8cb119f15482eae9d9fb51e98 Mon Sep 17 00:00:00 2001 +From bc355f5741338ff94e43f55a96574455c2d168a8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3072e5e2da9870d8cb119f15482eae9d9fb51e98 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index c9d70fb043..74d57329da 100644 +index 92451c2f83..2944a6fd48 100644 @@ -42 +43 @@ -@@ -187,7 +186,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer, +@@ -181,7 +180,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,