ethtool: rss: fix a handful of small bugs
Subsystems (3)
Jakub Kicinski
maintainercover ethtool: rss: fix a handful of small bugs
Fix a handful of small bugs in the ethtool Netlink RSS code.
Jakub Kicinski (6):
ethtool: rss: avoid modifying the RSS context response
ethtool: rss: add missing errno on RSS context delete
ethtool: rss: fix falsely ignoring indir table updates
ethtool: rss: fix indir_table and hkey leak on get_rxfh failure
ethtool: rss: fix hkey leak when indir_size is 0
ethtool: rss: avoid device context leak on reply-build failure
net/ethtool/rss.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
Signature · 1 line
2.54.0
Jakub Kicinski
maintainerPATCH 1/6 ethtool: rss: avoid modifying the RSS context response
Gemini says that we're modifying the RSS_CREATE response skb. I think it's right, the comment says that unicast() should unshare the skb but I'm not entirely sure what I meant there. netlink_trim() does a copy but only if skb is not well sized (it's at least 2x larger than necessary for the payload).
---
CC: [email protected]
CC: [email protected]
--- net/ethtool/rss.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
net/ethtool/rss.c +10 -8
@@ -981,11 +981,17 @@ ethnl_rss_create_validate(struct net_device *dev, struct genl_info *info) }static void -ethnl_rss_create_send_ntf (struct sk_buff *rsp,struct net_device *dev) +ethnl_rss_create_send_ntf (const struct sk_buff *rsp,struct net_device *dev) { -struct nlmsghdr *nlh = (void *)rsp->data;struct genlmsghdr *genl_hdr; +struct nlmsghdr *nlh; +struct sk_buff *ntf; + ntf =skb_copy_expand (rsp,0 ,0 ,GFP_KERNEL ); +if (!ntf) +return ; + + nlh =nlmsg_hdr (ntf);/* Convert the reply into a notification */ nlh->nlmsg_pid =0 ; nlh->nlmsg_seq =ethnl_bcast_seq_next ();
@@ -993,7 +999,7 @@ ethnl_rss_create_send_ntf(struct sk_buff *rsp, struct net_device *dev) genl_hdr =nlmsg_data (nlh); genl_hdr->cmd =ETHTOOL_MSG_RSS_CREATE_NTF ; -ethnl_multicast (rsp, dev); +ethnl_multicast (ntf, dev); }int ethnl_rss_create_doit (struct sk_buff *skb,struct genl_info *info)
@@ -1104,12 +1110,8 @@ int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info)genlmsg_end (rsp, hdr); -/* Use the same skb for the response and the notification, -* genlmsg_reply() will copy the skb if it has elevated user count. -*/ -skb_get (rsp); - ret =genlmsg_reply (rsp, info);ethnl_rss_create_send_ntf (rsp, dev); + ret =genlmsg_reply (rsp, info); rsp =NULL ; exit_unlock:
Signature · 1 line
2.54.0
Jakub Kicinski
maintainerPATCH 2/6 ethtool: rss: add missing errno on RSS context delete
In reply to Jakub KicinskiRemember to set ret before jumping out if someone tries to delete a context on a device which doesn't support contexts.
---
CC: [email protected]
CC: [email protected]
--- net/ethtool/rss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ethtool/rss.c +3 -1
@@ -1170,8 +1170,10 @@ int ethnl_rss_delete_doit(struct sk_buff *skb, struct genl_info *info) dev = req.dev; ops = dev->ethtool_ops; -if (!ops->create_rxfh_context) +if (!ops->create_rxfh_context) { + ret = -EOPNOTSUPP ; goto exit_free_dev; + }rtnl_lock ();netdev_lock_ops (dev);
Signature · 1 line
2.54.0
Jakub Kicinski
maintainerPATCH 3/6 ethtool: rss: fix falsely ignoring indir table updates
In reply to Jakub Kicinskirss_set_prep_indir() compares the new indirection table against the current one to determine whether any update is needed. The memcmp call passes data->indir_size as the length argument, but indir_size is the number of u32 entries, not the byte count.
---
CC: [email protected]
CC: [email protected]
--- net/ethtool/rss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/rss.c +1 -1
@@ -686,7 +686,7 @@ rss_set_prep_indir(struct net_device *dev, struct genl_info *info,ethtool_rxfh_indir_default (i, num_rx_rings); } - *mod |=memcmp (rxfh->indir, data->indir_table, data->indir_size); + *mod |=memcmp (rxfh->indir, data->indir_table, alloc_size);return user_size;
Signature · 1 line
2.54.0
Jakub Kicinski
maintainerPATCH 4/6 ethtool: rss: fix indir_table and hkey leak on get_rxfh failure
In reply to Jakub Kicinskirss_prepare_get() allocates the indirection table and hash key buffer via rss_get_data_alloc(), then calls ops->get_rxfh() to populate them. If get_rxfh() fails, the function returns an error without freeing the allocation.
---
CC: [email protected]
CC: [email protected]
--- net/ethtool/rss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ethtool/rss.c +3 -1
@@ -170,8 +170,10 @@ rss_prepare_get(const struct rss_req_info *request, struct net_device *dev, rxfh.key = data->hkey; ret = ops->get_rxfh (dev, &rxfh); -if (ret) +if (ret) { +rss_get_data_free (data); goto out_unlock; + } data->hfunc = rxfh.hfunc; data->input_xfrm = rxfh.input_xfrm;
Signature · 1 line
2.54.0
Jakub Kicinski
maintainerPATCH 5/6 ethtool: rss: fix hkey leak when indir_size is 0
In reply to Jakub Kicinskirss_get_data_alloc() allocates a single buffer that backs both the indirection table and the hash key, but only assigned data->indir_table when indir_size was nonzero. The expectation was that no driver implements RSS without supporting indirection table but apparently enic does just that (it's the only such in-tree driver). enic has get_rxfh_key_size but no get_rxfh_indir_size. data->indir_table stays as NULL, hkey gets set but rss_get_data_free() kfree(data->indir_table) is a nop and the allocation leaks.
Always store the allocation base in data->indir_table so the free path is unambiguous. No caller treats indir_table as a sentinel; everything keys off indir_size.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- net/ethtool/rss.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ethtool/rss.c +1 -2
@@ -134,8 +134,7 @@ rss_get_data_alloc(struct net_device *dev, struct rss_reply_data *data)if (!rss_config)return -ENOMEM ; -if (data->indir_size) - data->indir_table = (u32 *)rss_config; + data->indir_table = (u32 *)rss_config;if (data->hkey_size) data->hkey = rss_config + indir_bytes;
Signature · 1 line
2.54.0
Jakub Kicinski
maintainerPATCH 6/6 ethtool: rss: avoid device context leak on reply-build failure
In reply to Jakub KicinskiWe wait with filling the reply for new RSS context creation until after the driver ->create_rxfh_context call. The driver needs to fill some of the defaults in the context. The failure of rss_fill_reply() is somewhat theoretical, but doesn't take much effort to handle it properly. Call ->remove_rxfh_context().
If the driver's remove callback fails (some implementations like sfc can return real command errors from firmware RPCs) - skip the xa_erase and kfree, leaving the context in the xarray. This matches how ethnl_rss_delete_doit() behaves.
---
CC: [email protected]
CC: [email protected]
--- net/ethtool/rss.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/ethtool/rss.c +5 -1
@@ -1106,7 +1106,7 @@ int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info) ntf_fail |=rss_fill_reply (rsp, &req.base, &data.base);if (WARN_ON (!hdr || ntf_fail)) { ret = -EMSGSIZE ; - goto exit_unlock; + goto err_remove_ctx; }genlmsg_end (rsp, hdr);
@@ -1134,6 +1134,10 @@ int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info)nlmsg_free (rsp);return ret; +err_remove_ctx: +if (ops->remove_rxfh_context (dev, ctx, req.rss_context,NULL )) +/* leave the context on failure, like ethnl_rss_delete_doit() */ + goto exit_unlock; err_ctx_id_free:xa_erase (&dev->ethtool->rss_ctx, req.rss_context); err_unlock_free_ctx:
Signature · 1 line
2.54.0
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Fri, 22 May 2026 16:06:41 -0700 you wrote:
Fix a handful of small bugs in the ethtool Netlink RSS code.
Jakub Kicinski (6):
ethtool: rss: avoid modifying the RSS context response
ethtool: rss: add missing errno on RSS context delete
ethtool: rss: fix falsely ignoring indir table updates
ethtool: rss: fixindir_tableand hkey leak onget_rxfhfailure
ethtool: rss: fix hkey leak whenindir_sizeis 0
ethtool: rss: avoid device context leak on reply-build failure[...]
Here is the summary with links:
- [net,1/6] ethtool: rss: avoid modifying the RSS context response
https://git.kernel.org/netdev/net/c/c75b6f6eaacd - [net,2/6] ethtool: rss: add missing errno on RSS context delete https://git.kernel.org/netdev/net/c/3e6c6e9782ff - [net,3/6] ethtool: rss: fix falsely ignoring indir table updates https://git.kernel.org/netdev/net/c/8d60141a3287 - [net,4/6] ethtool: rss: fix indir_table and hkey leak on get_rxfh failure https://git.kernel.org/netdev/net/c/266297692f97 - [net,5/6] ethtool: rss: fix hkey leak when indir_size is 0 https://git.kernel.org/netdev/net/c/78ccf1a70c63 - [net,6/6] ethtool: rss: avoid device context leak on reply-build failure https://git.kernel.org/netdev/net/c/32a9ecde6273
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html