Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools/accounting/getdelays.c: fix netlink attribute length

A recent change to the netlink code: 6e237d099fac ("netlink: Relax attr
validation for fixed length types") logs a warning when programs send
messages with invalid attributes (e.g., wrong length for a u32). Yafang
reported this error message for tools/accounting/getdelays.c.

send_cmd() is wrongly adding 1 to the attribute length. As noted in
include/uapi/linux/netlink.h nla_len should be NLA_HDRLEN + payload
length, so drop the +1.

Fixes: 9e06d3f9f6b1 ("per task delay accounting taskstats interface: documentation fix")
Reported-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Yafang Shao <laoar.shao@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/20200327173111.63922-1-dsahern@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Ahern and committed by
Linus Torvalds
4054ab64 1a323ea5

+1 -1
+1 -1
tools/accounting/getdelays.c
··· 136 136 msg.g.version = 0x1; 137 137 na = (struct nlattr *) GENLMSG_DATA(&msg); 138 138 na->nla_type = nla_type; 139 - na->nla_len = nla_len + 1 + NLA_HDRLEN; 139 + na->nla_len = nla_len + NLA_HDRLEN; 140 140 memcpy(NLA_DATA(na), nla_data, nla_len); 141 141 msg.n.nlmsg_len += NLMSG_ALIGN(na->nla_len); 142 142