patch 'net/ice: check null scheduler root node' has been queued to stable release 25.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.11.1

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/02/26. 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/d86720570f6ddf64fa03c05a15b3d005bbd3ece9

Thanks.

Kevin

---
>From d86720570f6ddf64fa03c05a15b3d005bbd3ece9 Mon Sep 17 00:00:00 2001
From: Ciara Loftus <ciara.loftus at intel.com>
Date: Thu, 15 Jan 2026 10:38:21 +0000
Subject: [PATCH] net/ice: check null scheduler root node

[ upstream commit 17f994ba82dd8031958729ea1be4e6b641baa7e9 ]

When committing a new Tx scheduler hierarchy we assume the user has
created a root node. However if they have not, it leads to an invalid
memory access. While this would be an invalid configuration by the user
we should still prevent the invalid memory access from happening. Do so
by ensuring the root node is non null before dereferencing.

Fixes: 715d449a965b ("net/ice: enhance Tx scheduler hierarchy support")

Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/intel/ice/ice_tm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/intel/ice/ice_tm.c b/drivers/net/intel/ice/ice_tm.c
index f2d8e12181..db895613cc 100644
--- a/drivers/net/intel/ice/ice_tm.c
+++ b/drivers/net/intel/ice/ice_tm.c
@@ -817,6 +817,11 @@ commit_new_hierarchy(struct rte_eth_dev *dev)
 	uint8_t q_lvl = ice_get_leaf_level(pf);
 	uint8_t qg_lvl = q_lvl - 1;
-
 	struct ice_sched_node *new_vsi_root = hw->vsi_ctx[pf->main_vsi->idx]->sched.vsi_node[0];
+
+	if (sw_root == NULL) {
+		PMD_DRV_LOG(ERR, "No root node defined in TM hierarchy");
+		return -1;
+	}
+
 	/* handle case where VSI node needs to move DOWN the hierarchy */
 	while (new_vsi_root->tx_sched_layer < new_root_level) {
-- 
2.53.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-02-26 10:16:49.676548777 +0000
+++ 0065-net-ice-check-null-scheduler-root-node.patch	2026-02-26 10:16:46.992459417 +0000
@@ -1 +1 @@
-From 17f994ba82dd8031958729ea1be4e6b641baa7e9 Mon Sep 17 00:00:00 2001
+From d86720570f6ddf64fa03c05a15b3d005bbd3ece9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 17f994ba82dd8031958729ea1be4e6b641baa7e9 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org