| Message ID | 1461772388-3763-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Pablo Neira |
| Headers | show |
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Wed, 27 Apr 2016 17:53:08 +0200 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c index 7785fb5eb93f..b5ca536e56a8 100644 --- a/Documentation/accounting/getdelays.c +++ b/Documentation/accounting/getdelays.c @@ -505,6 +505,8 @@ int main(int argc, char *argv[]) if (!loop) goto done; break; + case TASKSTATS_TYPE_NULL: + break; default: fprintf(stderr, "Unknown nested" " nla_type %d\n", @@ -512,7 +514,8 @@ 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;
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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)