Commit 99e3eb45 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: ethtool: avoid OOB accesses in PAUSE_SET 



We now reuse .parse_request() from GET on SET, so we need to make sure
that the policies for both cover the attributes used for .parse_request().
genetlink will only allocate space in info->attrs for ARRAY_SIZE(policy).

Reported-by: default avatar <syzbot+430f9f76633641a62217@syzkaller.appspotmail.com>
Fixes: 963781bd ("net: ethtool: call .parse_request for SET handlers")
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Tested-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250626233926.199801-1-kuba@kernel.org


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

net/ethtool/netlink.h

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ extern const struct nla_policy ethnl_channels_set_policy[ETHTOOL_A_CHANNELS_COMB 
extern const struct nla_policy ethnl_coalesce_get_policy[ETHTOOL_A_COALESCE_HEADER + 1];

extern const struct nla_policy ethnl_coalesce_set_policy[ETHTOOL_A_COALESCE_MAX + 1];

extern const struct nla_policy ethnl_pause_get_policy[ETHTOOL_A_PAUSE_STATS_SRC + 1];

extern const struct nla_policy ethnl_pause_set_policy[ETHTOOL_A_PAUSE_TX + 1];

extern const struct nla_policy ethnl_pause_set_policy[ETHTOOL_A_PAUSE_STATS_SRC + 1];

extern const struct nla_policy ethnl_eee_get_policy[ETHTOOL_A_EEE_HEADER + 1];

extern const struct nla_policy ethnl_eee_set_policy[ETHTOOL_A_EEE_TX_LPI_TIMER + 1];

extern const struct nla_policy ethnl_tsinfo_get_policy[ETHTOOL_A_TSINFO_MAX + 1];

net/ethtool/pause.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ const struct nla_policy ethnl_pause_set_policy[] = { 
	[ETHTOOL_A_PAUSE_AUTONEG]		= { .type = NLA_U8 },

	[ETHTOOL_A_PAUSE_RX]			= { .type = NLA_U8 },

	[ETHTOOL_A_PAUSE_TX]			= { .type = NLA_U8 },

	[ETHTOOL_A_PAUSE_STATS_SRC]		= { .type = NLA_REJECT },

};



static int