Skip to contentSkip to conversation

net: airoha: Fix off-by-one error in HTB rate-limit channel removal

PATCH In review Wayen Yan 2 participants 2 messages Jun 17

Subsystems (4)
lore
Share & tools
lore

Wayen Yan

author
#0 lore raw

PATCH 1/1 net: airoha: Fix off-by-one error in HTB rate-limit channel removal

In airoha_tc_remove_htb_queue(), the rate-limit was being cleared using (queue + 1) instead of queue, causing:
- The original channel rate-limit configuration to remain active
- The next channel to be incorrectly disabled
- Potential out-of-bounds access when queue == 3 (channel 4)

The alloc path (airoha_tc_htb_alloc_leaf_queue) correctly uses channel (0..3), but the remove path incorrectly added 1.

Fix by using queue directly to match the alloc and rollback paths.

Fixes ef1ca9271313 ("net: airoha: Add sched HTB offload support")
---
 drivers/net/ethernet/airoha/airoha_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/airoha/airoha_eth.c +1 -1
index 31cdb11cd7..02807b3967 100644
@@ -2805,7 +2805,7 @@ static void airoha_tc_remove_htb_queue(struct net_device *dev, int queue)
 	struct airoha_gdm_port *port = netdev_priv(dev);
 
 	netif_set_real_num_tx_queues(dev, dev->real_num_tx_queues - 1);
-	airoha_qdma_set_tx_rate_limit(dev, queue + 1, 0, 0);
+	airoha_qdma_set_tx_rate_limit(dev, queue, 0, 0);
 	clear_bit(queue, port->qos_sq_bmap);
 }
 
Signature · 1 line
2.51.0
maintainer
#1 lore raw
Quoted 22 lines

In airoha_tc_remove_htb_queue(), the rate-limit was being cleared using (queue + 1) instead of queue, causing:
- The original channel rate-limit configuration to remain active
- The next channel to be incorrectly disabled
- Potential out-of-bounds access when queue == 3 (channel 4)

The alloc path (airoha_tc_htb_alloc_leaf_queue) correctly uses channel (0..3), but the remove path incorrectly added 1.

Fix by using queue directly to match the alloc and rollback paths.

Fixes ef1ca9271313 ("net: airoha: Add sched HTB offload support")
---
 drivers/net/ethernet/airoha/airoha_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/airoha/airoha_eth.c +0 -0
index 31cdb11cd7..02807b3967 100644

drivers/net/ethernet/airoha/airoha_eth.c static void airoha_tc_remove_htb_queue(struct net_device *dev, int queue) · line 2810

Quoted 7 lines
drivers/net/ethernet/airoha/airoha_eth.c +1 -1
@@ -2805,7 +2805,7 @@ static void airoha_tc_remove_htb_queue(struct net_device *dev, int queue)
 	struct airoha_gdm_port *port = netdev_priv(dev);
 
 	netif_set_real_num_tx_queues(dev, dev->real_num_tx_queues - 1);
-	airoha_qdma_set_tx_rate_limit(dev, queue + 1, 0, 0);
+	airoha_qdma_set_tx_rate_limit(dev, queue, 0, 0);
 	clear_bit(queue, port->qos_sq_bmap);
 }

Please hold on with this patch, I am aware of the bug and the fix is already in my queue [0]. I am just waiting the net-next to be merged into net in order to avoid merge conflicts.

Regards,
Lorenzo

[0] https://github.com/LorenzoBianconi/net-next/commits/airoha-qos-fixes-for-net/

Quoted 5 lines
Signature · 2 lines
-- 
2.51.0