iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taskstats: fix nl parsing in accounting/getdelays.c

Browse Source 
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 80df554275, because the
kernel didn't put more than two nested attributes.

Fixes: a3baf649ca ("[PATCH] per-task-delay-accounting: documentation")
Fixes: 80df554275 ("taskstats: use the libnl API to align nlattr on 64-bit")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2016-04-27 17:53:08 +02:00 committed by David S. Miller
parent 0e7dd0c9c3
commit 570d8e9398
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/accounting/getdelays.c
View File

@ -505,6 +505,8 @@ int main(int argc, char *argv[])
if (!loop) if (!loop)
goto done; goto done;
break; break;
case TASKSTATS_TYPE_NULL:
break;
default: default:
fprintf(stderr, "Unknown nested" fprintf(stderr, "Unknown nested"
" nla_type %d\n", " nla_type %d\n",
@ -512,7 +514,8 @@ int main(int argc, char *argv[])
break; break;
} }
len2 += NLA_ALIGN(na->nla_len); len2 += NLA_ALIGN(na->nla_len);
na = (struct nlattr *) ((char *) na + len2); na = (struct nlattr *)((char *)na +
NLA_ALIGN(na->nla_len));
} }
break; break;