Commit 78ccf1a7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

ethtool: rss: fix hkey leak when indir_size is 0 

rss_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.

Fixes: 7112a046 ("ethtool: add netlink based get rss support")
Link: https://patch.msgid.link/20260522230647.1705600-6-kuba@kernel.org


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

net/ethtool/rss.c

+1 −2
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ 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;

	if (data->hkey_size)

		data->hkey = rss_config + indir_bytes;