Commit 3fa58266 authored Nov 12, 2013 by Chen Gang Committed by Linus Torvalds Nov 13, 2013

kernel/taskstats.c: add nla_nest_cancel() for failure processing between...

kernel/taskstats.c: add nla_nest_cancel() for failure processing between nla_nest_start() and nla_nest_end()

When failure occurs between nla_nest_start() and nla_nest_end(), we should
call nla_nest_cancel() to clean up related things.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f02147ef

kernel/taskstats.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -404,11 +404,15 @@ static struct taskstats mk_reply(struct sk_buff skb, int type, u32 pid)
		if (!na)
		goto err;

		if (nla_put(skb, type, sizeof(pid), &pid) < 0)
		if (nla_put(skb, type, sizeof(pid), &pid) < 0) {
		nla_nest_cancel(skb, na);
		goto err;
		}
		ret = nla_reserve(skb, TASKSTATS_TYPE_STATS, sizeof(struct taskstats));
		if (!ret)
		if (!ret) {
		nla_nest_cancel(skb, na);
		goto err;
		}
		nla_nest_end(skb, na);

		return nla_data(ret);