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

Commit 002e9efb authored by David Ahern's avatar David Ahern Committed by Greg Kroah-Hartman
Browse files

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



commit 4054ab64e29bb05b3dfe758fff3c38a74ba753bb upstream.

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: 9e06d3f9 ("per task delay accounting taskstats interface: documentation fix")
Reported-by: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Tested-by: default avatarYafang 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f27cae3

tools/accounting/getdelays.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid, 
	msg.g.version = 0x1;

	na = (struct nlattr *) GENLMSG_DATA(&msg);

	na->nla_type = nla_type;

	na->nla_len = nla_len + 1 + NLA_HDRLEN;

	na->nla_len = nla_len + NLA_HDRLEN;

	memcpy(NLA_DATA(na), nla_data, nla_len);

	msg.n.nlmsg_len += NLMSG_ALIGN(na->nla_len);