Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d83787c2 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

rtnetlink: fix if_nlmsg_stats_size() under estimation 



[ Upstream commit d34367991933d28bd7331f67a759be9a8c474014 ]

rtnl_fill_statsinfo() is filling skb with one mandatory if_stats_msg structure.

nlmsg_put(skb, pid, seq, type, sizeof(struct if_stats_msg), flags);

But if_nlmsg_stats_size() never considered the needed storage.

This bug did not show up because alloc_skb(X) allocates skb with
extra tailroom, because of added alignments. This could very well
be changed in the future to have deterministic behavior.

Fixes: 10c9ead9 ("rtnetlink: add new RTM_GETSTATS message to dump link stats")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Roopa Prabhu <roopa@nvidia.com>
Acked-by: default avatarRoopa Prabhu <roopa@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0311d977

net/core/rtnetlink.c

+1 −1
Original line number Diff line number Diff line
@@ -4950,7 +4950,7 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev, 
static size_t if_nlmsg_stats_size(const struct net_device *dev,

				  u32 filter_mask)

{

	size_t size = 0;

	size_t size = NLMSG_ALIGN(sizeof(struct if_stats_msg));



	if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_64, 0))

		size += nla_total_size_64bit(sizeof(struct rtnl_link_stats64));