Skip to contentSkip to conversation

ethtool: strset: fix message length calculation

PATCH Applied Jakub Kicinski 2 participants 2 messages Jun 12, 2021 – Jun 14, 2021

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 ethtool: strset: fix message length calculation

Outer nest for ETHTOOL_A_STRSET_STRINGSETS is not accounted for. This may result in ETHTOOL_MSG_STRSET_GET producing a warning like:

calculated message payload length (684) not sufficient
WARNING: CPU: 0 PID: 30967 at net/ethtool/netlink.c:369 ethnl_default_doit+0x87a/0xa20

and a splat.

As usually with such warnings three conditions must be met for the warning to trigger:
- there must be no skb size rounding up (e.g. reply_size of 684);
- string set must be per-device (so that the header gets populated);
- the device name must be at least 12 characters long.

all in all with current user space it looks like reading priv flags is the only place this could potentially happen. Or with syzbot :)

Reported-by [email protected]
Fixes 71921690f974 ("ethtool: provide string sets with STRSET_GET request")
---
 net/ethtool/strset.c | 2 ++
 1 file changed, 2 insertions(+)
net/ethtool/strset.c +2 -0
index b3029fff715d..2d51b7ab4dc5 100644
@@ -353,6 +353,8 @@ static int strset_reply_size(const struct ethnl_req_info *req_base,
 	int len = 0;
 	int ret;
 
+	len += nla_total_size(0); /* ETHTOOL_A_STRSET_STRINGSETS */
+
 	for (i = 0; i < ETH_SS_COUNT; i++) {
 		const struct strset_info *set_info = &data->sets[i];
 
Signature · 1 line
2.31.1
#1 lore raw
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 9 lines · On Fri, 11 Jun 2021 18:49:48 -0700 you wrote:

Outer nest for ETHTOOL_A_STRSET_STRINGSETS is not accounted for. This may result in ETHTOOL_MSG_STRSET_GET producing a warning like:

calculated message payload length (684) not sufficient
WARNING: CPU: 0 PID: 30967 at net/ethtool/netlink.c:369 ethnl_default_doit+0x87a/0xa20

and a splat.

[...]

Here is the summary with links:
- [net] ethtool: strset: fix message length calculation

    https://git.kernel.org/netdev/net/c/e175aef90269

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html