From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: bsingharora@gmail.com
Cc: netdev@vger.kernel.org, davem@davemloft.net,
linux-kernel@vger.kernel.org, linux-wpan@vger.kernel.org,
aar@pengutronix.de, pablo@netfilter.org, kaber@trash.net,
kadlec@blackhole.kfki.hu, pshelar@nicira.com,
kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org,
netfilter-devel@vger.kernel.org, dev@openvswitch.org,
steffen.klassert@secunet.com, herbert@gondor.apana.org.au,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH net-next] taskstats: fix nl parsing in accounting/getdelays.c
Date: Wed, 27 Apr 2016 17:47:57 +0200 [thread overview]
Message-ID: <1461772077-3216-1-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <5720DED8.4090706@6wind.com>
The type TASKSTATS_TYPE_NULL should always be ignored.
When jumping to the next attribute, only the length of the current
attribute should be added, not the length of all nested attributes.
This last bug was not visible before commit 80df554275c2, because the
kernel didn't put more than two nested attributes.
Fixes: a3baf649ca9c ("[PATCH] per-task-delay-accounting: documentation")
Fixes: 80df554275c2 ("taskstats: use the libnl API to align nlattr on 64-bit")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
Documentation/accounting/getdelays.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
index 7785fb5eb93f..d3caa6748a46 100644
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
@@ -512,7 +512,7 @@ int main(int argc, char *argv[])
break;
}
len2 += NLA_ALIGN(na->nla_len);
- na = (struct nlattr *) ((char *) na + len2);
+ na = (struct nlattr *) ((char *) na + NLA_ALIGN(na->nla_len));
}
break;
--
2.8.1
next prev parent reply other threads:[~2016-04-27 15:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-22 15:31 [PATCH net-next 0/9] netlink: align attributes when needed (patchset #1) Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 1/9] libnl: fix help of _64bit functions Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 2/9] libnl: nla_put_le64(): align on a 64-bit area Nicolas Dichtel
[not found] ` <1461339084-3849-3-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2016-04-22 16:51 ` Eric Dumazet
2016-04-23 17:05 ` Alexander Aring
2016-04-23 17:28 ` Alexander Aring
[not found] ` <9d534571-916d-b368-a398-7f03a1f512ec-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-04-25 7:41 ` Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 3/9] libnl: nla_put_be64(): " Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 4/9] libnl: nla_put_net64(): " Nicolas Dichtel
[not found] ` <1461339084-3849-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2016-04-22 15:31 ` [PATCH net-next 5/9] libnl: nla_put_s64(): " Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 6/9] libnl: nla_put_msecs(): " Nicolas Dichtel
2016-04-24 0:13 ` [PATCH net-next 0/9] netlink: align attributes when needed (patchset #1) David Miller
2016-04-22 15:31 ` [PATCH net-next 7/9] libnl: add nla_put_u64_64bit() helper Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 8/9] xfrm: align nlattr properly when needed Nicolas Dichtel
2016-04-22 15:31 ` [PATCH net-next 9/9] taskstats: use the libnl API to align nlattr on 64-bit Nicolas Dichtel
[not found] ` <1461339084-3849-10-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2016-04-27 1:14 ` Balbir Singh
[not found] ` <57201287.80002-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-27 7:29 ` Nicolas Dichtel
2016-04-27 12:29 ` Balbir Singh
[not found] ` <5720B0A2.1030405-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-27 15:46 ` Nicolas Dichtel
2016-04-27 15:47 ` Nicolas Dichtel [this message]
[not found] ` <1461772077-3216-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2016-04-27 15:49 ` [PATCH net-next] taskstats: fix nl parsing in accounting/getdelays.c Nicolas Dichtel
[not found] ` <5720DFA1.3080503-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2016-04-27 15:53 ` [PATCH net-next v2] " Nicolas Dichtel
[not found] ` <1461772388-3763-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2016-04-27 16:56 ` David Miller
2016-04-27 16:41 ` [PATCH net-next 9/9] taskstats: use the libnl API to align nlattr on 64-bit David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461772077-3216-1-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=aar@pengutronix.de \
--cc=bsingharora@gmail.com \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=herbert@gondor.apana.org.au \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=pshelar@nicira.com \
--cc=steffen.klassert@secunet.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).