ethtool: ntuple: fix rss + ring_cookie check

commit 2b91cc1214b165c25ac9b0885db89a0d3224028a upstream.

The info.flow_type is for RXFH commands, ntuple flow_type is inside
the flow spec. The check currently does nothing, as info.flow_type
is 0 (or even uninitialized by user space) for ETHTOOL_SRXCLSRLINS.

Fixes: 9e43ad7a1ede ("net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in")
Reviewed-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250201013040.725123-3-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index ff988e5faa4f8c08eefabcfb66d86a780951e3e7..8b9692c35e7067cac88f7b92c010ab2ffea0e24b 100644 (file)
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -993,7 +993,7 @@ 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 (cmd == ETHTOOL_SRXCLSRLINS && info.flow_type & FLOW_RSS &&
+       if (cmd == ETHTOOL_SRXCLSRLINS && info.fs.flow_type & FLOW_RSS &&
            !ops->cap_rss_rxnfc_adds &&
            ethtool_get_flow_spec_ring(info.fs.ring_cookie))
                return -EINVAL;