Skip to content

Commit

Permalink
[PATCH] taskstats: fix sk_buff leak
Browse files Browse the repository at this point in the history
'return genlmsg_cancel()' in taskstats_user_cmd/taskstats_exit_send
potentially leaks a skb.  Unless we pass 'rep_skb' to the netlink layer
we own sk_buff.  This means we should always do kfree_skb() on failure.

[ Thomas acked and pointed out missing return value in original version ]

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Thomas Graf <tgraf@suug.ch>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Jay Lan <jlan@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Oct 29, 2006
1 parent 5211e6e commit d46a3d0
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions kernel/taskstats.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
return send_reply(rep_skb, info->snd_pid);

nla_put_failure:
return genlmsg_cancel(rep_skb, reply);
rc = genlmsg_cancel(rep_skb, reply);
err:
nlmsg_free(rep_skb);
return rc;
Expand Down Expand Up @@ -507,7 +507,6 @@ void taskstats_exit_send(struct task_struct *tsk, struct taskstats *tidstats,

nla_put_failure:
genlmsg_cancel(rep_skb, reply);
goto ret;
err_skb:
nlmsg_free(rep_skb);
ret:
Expand Down

0 comments on commit d46a3d0

Please sign in to comment.