ethtool: Fix access to uninitialized fields in set RXNFC command
Subsystems (3)
PATCH 1/1 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
--- net/ethtool/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ethtool/ioctl.c +2 -1
@@ -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 &ðtool_get_flow_spec_ring (info.fs.ring_cookie))return -EINVAL ;
Signature · 1 line
2.40.1
Quoted 11 lines · Gal Pressman
The check for non-zero ring with RSS is only relevant for
ETHTOOL_SRXCLSRLINScommand, in other cases the check tries to access memory which was not initialized by the userspace tool. Only perform the check in case ofETHTOOL_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
Quoted 5 lines
Fixes 9e43ad7a1ede ("net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in")Reviewed-by Dragos Tatulea <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Gal Pressman <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 5 lines · On Mon, 2 Dec 2024 18:48:05 +0200 you wrote:
The check for non-zero ring with RSS is only relevant for
ETHTOOL_SRXCLSRLINScommand, in other cases the check tries to access memory which was not initialized by the userspace tool. Only perform the check in case ofETHTOOL_SRXCLSRLINS.
Quoted 7 lines
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[...]
Here is the summary with links:
- [net] ethtool: Fix access to uninitialized fields in set RXNFC command
https://git.kernel.org/netdev/net/c/940719094776
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html