Commit a93dcaad authored by Chris Mi's avatar Chris Mi Committed by Jakub Kicinski
Browse files

net: psample: Fix netlink skb length with tunnel info 



Currently, the psample netlink skb is allocated with a size that does
not account for the nested 'PSAMPLE_ATTR_TUNNEL' attribute and the
padding required for the 64-bit attribute 'PSAMPLE_TUNNEL_KEY_ATTR_ID'.
This can result in failure to add attributes to the netlink skb due
to insufficient tail room. The following error message is printed to
the kernel log: "Could not create psample log message".

Fix this by adjusting the allocation size to take into account the
nested attribute and the padding.

Fixes: d8bed686 ("net: psample: Add tunnel support")
CC: Yotam Gigi <yotam.gi@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Link: https://lore.kernel.org/r/20210225075145.184314-1-cmi@nvidia.com


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

net/psample/psample.c

+2 −2
Original line number Diff line number Diff line
@@ -309,10 +309,10 @@ static int psample_tunnel_meta_len(struct ip_tunnel_info *tun_info) 
	unsigned short tun_proto = ip_tunnel_info_af(tun_info);

	const struct ip_tunnel_key *tun_key = &tun_info->key;

	int tun_opts_len = tun_info->options_len;

	int sum = 0;

	int sum = nla_total_size(0);	/* PSAMPLE_ATTR_TUNNEL */



	if (tun_key->tun_flags & TUNNEL_KEY)

		sum += nla_total_size(sizeof(u64));

		sum += nla_total_size_64bit(sizeof(u64));



	if (tun_info->mode & IP_TUNNEL_INFO_BRIDGE)

		sum += nla_total_size(0);