Commit f6fa45d6 authored by Yue Haibing's avatar Yue Haibing Committed by Jakub Kicinski
Browse files

net: Reoder rxq_idx check in __net_mp_open_rxq() 



array_index_nospec() clamp the rxq_idx within the range of
[0, dev->real_num_rx_queues), move the check before it.

Signed-off-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarMina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20250624140159.3929503-1-yuehaibing@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3b3ccf9e

net/core/netdev_rx_queue.c

+2 −4
Original line number Diff line number Diff line
@@ -97,14 +97,12 @@ int __net_mp_open_rxq(struct net_device *dev, unsigned int rxq_idx, 
	if (!netdev_need_ops_lock(dev))

		return -EOPNOTSUPP;



	if (rxq_idx >= dev->real_num_rx_queues)

		return -EINVAL;

	rxq_idx = array_index_nospec(rxq_idx, dev->real_num_rx_queues);



	if (rxq_idx >= dev->real_num_rx_queues) {

		NL_SET_ERR_MSG(extack, "rx queue index out of range");

		return -ERANGE;

	}

	rxq_idx = array_index_nospec(rxq_idx, dev->real_num_rx_queues);



	if (dev->cfg->hds_config != ETHTOOL_TCP_DATA_SPLIT_ENABLED) {

		NL_SET_ERR_MSG(extack, "tcp-data-split is disabled");

		return -EINVAL;