Only the entries below dev->num_tc are valid in dev->tc_to_txq[], and dev->prio_tc_map[] may only name classes below it. netdev_set_num_tc() lowers dev->num_tc without touching either array. netdev_txq_to_tc() walks all TC_MAX_QUEUE slots and netdev_get_prio_tc_map() returns the entry as it stands, so a leftover entry is handed out as a traffic class >= dev->num_tc. Taking that class from netdev_txq_to_tc(), __netif_set_xps_queue() rejects only a negative one and indexes an XPS map sized for dev->num_tc classes: tci = j * num_tc + tc; RCU_INIT_POINTER(new_dev_maps->attr_map[tci], map); Any caller that lowers num_tc leaves such entries behind, and mqprio_destroy() tears down with netdev_set_num_tc(dev, 0) rather than netdev_reset_tc(). After mqprio with 8 classes then 1, tc_to_txq[1..7] still describe txq 1..7. The splat is from an XPS write to txq 2: BUG: KASAN: slab-out-of-bounds in __netif_set_xps_queue+0x1eb9/0x2440 Write of size 8 at addr ffff888110e978d8 by task xps_oob/573 __netif_set_xps_queue+0x1eb9/0x2440 xps_rxqs_store+0x24d/0x360 netdev_queue_attr_store+0x61/0x90 Allocated by task 573: __kmalloc_noprof+0x246/0x6c0 __netif_set_xps_queue+0x8ca/0x2440 The buggy address is located 0 bytes to the right of allocated 88-byte region [ffff888110e97880, ffff888110e978d8) Clear the entries the new num_tc no longer covers, before publishing num_tc so that a lockless reader cannot observe the new num_tc together with the old mappings. For num_tc == 0 this leaves the same state as netdev_reset_tc(). Fixes: 184c449f91fe ("net: Add support for XPS with QoS via traffic classes") Assisted-by: LLM Signed-off-by: Norbert Szetei --- A follow-up for net-next can factor this into a helper shared with netdev_reset_tc() and netdev_unbind_sb_channel(). I can share the reproducer on request. net/core/dev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index ecfbd72..e63e36a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3145,6 +3145,8 @@ EXPORT_SYMBOL(netdev_set_tc_queue); int netdev_set_num_tc(struct net_device *dev, u8 num_tc) { + int i; + if (num_tc > TC_MAX_QUEUE) return -EINVAL; @@ -3153,6 +3155,14 @@ int netdev_set_num_tc(struct net_device *dev, u8 num_tc) #endif netdev_unbind_all_sb_channels(dev); + /* Drop the mappings the new num_tc no longer covers. */ + for (i = num_tc; i < TC_MAX_QUEUE; i++) + WRITE_ONCE(dev->tc_to_txq[i].combined, 0); + for (i = 0; i <= TC_BITMASK; i++) { + if (READ_ONCE(dev->prio_tc_map[i]) >= num_tc) + WRITE_ONCE(dev->prio_tc_map[i], 0); + } + WRITE_ONCE(dev->num_tc, num_tc); return 0; } -- 2.55.0