| Message ID | 20210225075145.184314-1-cmi@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a93dcaada2ddb58dbc72652b42548adedd646d7a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: psample: Fix netlink skb length with tunnel info | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | fail | 3 blamed authors not CCed: jiri@mellanox.com davem@davemloft.net chrism@mellanox.com; 3 maintainers not CCed: chrism@mellanox.com davem@davemloft.net jiri@mellanox.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 12 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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
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);
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(-)