* [PATCH net] net: psample: Fix netlink skb length with tunnel info
@ 2021-02-25 7:51 Chris Mi
2021-02-25 18:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Chris Mi @ 2021-02-25 7:51 UTC (permalink / raw)
To: netdev; +Cc: kuba, idosch, jiri, Chris Mi, Yotam Gigi
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: d8bed686ab96 ("net: psample: Add tunnel support")
CC: Yotam Gigi <yotam.gi@gmail.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Chris Mi <cmi@nvidia.com>
---
net/psample/psample.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/psample/psample.c b/net/psample/psample.c
index 33e238c965bd..482c07f2766b 100644
--- a/net/psample/psample.c
+++ b/net/psample/psample.c
@@ -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);
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: psample: Fix netlink skb length with tunnel info
2021-02-25 7:51 [PATCH net] net: psample: Fix netlink skb length with tunnel info Chris Mi
@ 2021-02-25 18:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-02-25 18:00 UTC (permalink / raw)
To: Chris Mi; +Cc: netdev, kuba, idosch, jiri, yotam.gi
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Thu, 25 Feb 2021 15:51:45 +0800 you wrote:
> 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".
>
> [...]
Here is the summary with links:
- [net] net: psample: Fix netlink skb length with tunnel info
https://git.kernel.org/netdev/net/c/a93dcaada2dd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-25 18:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-25 7:51 [PATCH net] net: psample: Fix netlink skb length with tunnel info Chris Mi
2021-02-25 18:00 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.