diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 16:38:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 16:38:10 -0700 |
| commit | 16ae527bfa03c6c82328098eafae972807ed32d4 (patch) | |
| tree | cad921d7eeff11c9063a36204118ac8a66029c8f /kernel/audit.c | |
| parent | e23a5f66877d32f21a2ac15a200ad4a2b4c8b0ee (diff) | |
| parent | 6793a051fb9311f0f1ab7eafc5a9e69b8a1bd8d4 (diff) | |
| download | op-kernel-dev-16ae527bfa03c6c82328098eafae972807ed32d4.zip op-kernel-dev-16ae527bfa03c6c82328098eafae972807ed32d4.tar.gz | |
Merge branch 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] list_for_each_rcu must die: audit
[patch 1/1] audit_send_reply(): fix error-path memory leak
[PATCH] open sessionid permissions
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index b7d3709..e8692a5 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -572,16 +572,17 @@ void audit_send_reply(int pid, int seq, int type, int done, int multi, skb = audit_make_reply(pid, seq, type, done, multi, payload, size); if (!skb) - return; + goto out; reply->pid = pid; reply->skb = skb; tsk = kthread_run(audit_send_reply_thread, reply, "audit_send_reply"); - if (IS_ERR(tsk)) { - kfree(reply); - kfree_skb(skb); - } + if (!IS_ERR(tsk)) + return; + kfree_skb(skb); +out: + kfree(reply); } /* |
