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 231C445804 for ; Fri, 23 Aug 2024 18:22:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C6E943394; Fri, 23 Aug 2024 18:22:42 +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 E422B4338F for ; Fri, 23 Aug 2024 18:22:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430160; 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=QqicKnbadH/BF7aCRgMksNK7HGUeglDhCVgwskVSN2k=; b=Uln9VYOFJsUe26pDPid9EeWqbolonqw9IX6jtya+pkS2B3Ccki/zt9mBlQJ6Ras+t9Ureo up1azdhBF6QI8//VFtiwk8toBtOBRtuE+ity7ZGd+atHELMyuAnkT0plwqfSsS1MwkUCc/ duiHQJtVrsNiGS15NA7En+T83T7kofs= Received: from mx-prod-mc-05.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-471-opOTDChOMOaujxoeLmfbtg-1; Fri, 23 Aug 2024 12:22:37 -0400 X-MC-Unique: opOTDChOMOaujxoeLmfbtg-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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D29341955F03; Fri, 23 Aug 2024 16:22:34 +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 C4FD91956053; Fri, 23 Aug 2024 16:22:32 +0000 (UTC) From: Kevin Traynor To: Stefan Wegrzyn Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix pointer to variable outside scope' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:31 +0100 Message-ID: <20240823161929.1004778-83-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/56c1083497d803e9f77573d62adf5abef5f3a3e0 Thanks. Kevin --- >From 56c1083497d803e9f77573d62adf5abef5f3a3e0 Mon Sep 17 00:00:00 2001 From: Stefan Wegrzyn Date: Tue, 25 Jun 2024 12:12:10 +0100 Subject: [PATCH] net/ice/base: fix pointer to variable outside scope [ upstream commit 794adf885cbbc949b4a292ce98bc57d77ea77391 ] Currently, the 'temp' variable is in smaller scope than 'first_teid_ptr' which can point to it. This means on new loop iterations the memory goes out of scope and we can end up with a dangling pointer. Move 'temp' to outside of the loop to fix it. Fixes: 254f19c8c061 ("net/ice/base: modify recursive way of adding nodes") Signed-off-by: Stefan Wegrzyn Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index f3655a820f..92451c2f83 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -1031,9 +1031,9 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, u16 new_num_nodes = num_nodes; enum ice_status status = ICE_SUCCESS; + u32 temp; *num_nodes_added = 0; while (*num_nodes_added < num_nodes) { u16 max_child_nodes, num_added = 0; - u32 temp; status = ice_sched_add_nodes_to_hw_layer(pi, tc_node, parent, -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.198011388 +0100 +++ 0083-net-ice-base-fix-pointer-to-variable-outside-scope.patch 2024-08-23 17:18:09.760430245 +0100 @@ -1 +1 @@ -From 794adf885cbbc949b4a292ce98bc57d77ea77391 Mon Sep 17 00:00:00 2001 +From 56c1083497d803e9f77573d62adf5abef5f3a3e0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 794adf885cbbc949b4a292ce98bc57d77ea77391 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index d694bfd414..c9d70fb043 100644 +index f3655a820f..92451c2f83 100644 @@ -25 +26 @@ -@@ -1070,9 +1070,9 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, +@@ -1031,9 +1031,9 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, @@ -27 +28 @@ - int status = 0; + enum ice_status status = ICE_SUCCESS;