Skip to content

Commit 5dd0dfd

Browse files
Nick Childkuba-moo
authored andcommitted
net: Catch invalid index in XPS mapping
When setting the XPS value of a TX queue, warn the user once if the index of the queue is greater than the number of allocated TX queues. Previously, this scenario went uncaught. In the best case, it resulted in unnecessary allocations. In the worst case, it resulted in out-of-bounds memory references through calls to `netdev_get_tx_queue( dev, index)`. Therefore, it is important to inform the user but not worth returning an error and risk downing the netdevice. Signed-off-by: Nick Child <nnac123@linux.ibm.com> Reviewed-by: Piotr Raczynski <piotr.raczynski@intel.com> Link: https://lore.kernel.org/r/20230321150725.127229-1-nnac123@linux.ibm.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 5da1289 commit 5dd0dfd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

net/core/dev.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,6 +2535,8 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
25352535
struct xps_map *map, *new_map;
25362536
unsigned int nr_ids;
25372537

2538+
WARN_ON_ONCE(index >= dev->num_tx_queues);
2539+
25382540
if (dev->num_tc) {
25392541
/* Do not allow XPS on subordinate device directly */
25402542
num_tc = dev->num_tc;

0 commit comments

Comments
 (0)