Commit 94071909 authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

ethtool: Fix access to uninitialized fields in set RXNFC command 

The check for non-zero ring with RSS is only relevant for
ETHTOOL_SRXCLSRLINS command, in other cases the check tries to access
memory which was not initialized by the userspace tool. Only perform the
check in case of ETHTOOL_SRXCLSRLINS.

Without this patch, filter deletion (for example) could statistically
result in a false error:
  # ethtool --config-ntuple eth3 delete 484
  rmgr: Cannot delete RX class rule: Invalid argument
  Cannot delete classification rule

Fixes: 9e43ad7a ("net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in")
Link: https://lore.kernel.org/netdev/871a9ecf-1e14-40dd-bbd7-e90c92f89d47@nvidia.com/


Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Reviewed-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Link: https://patch.msgid.link/20241202164805.1637093-1-gal@nvidia.com


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

net/ethtool/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -993,7 +993,8 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev, 
		return rc;



	/* Nonzero ring with RSS only makes sense if NIC adds them together */

	if (info.flow_type & FLOW_RSS && !ops->cap_rss_rxnfc_adds &&

	if (cmd == ETHTOOL_SRXCLSRLINS && info.flow_type & FLOW_RSS &&

	    !ops->cap_rss_rxnfc_adds &&

	    ethtool_get_flow_spec_ring(info.fs.ring_cookie))

		return -EINVAL;