diff options
author | Paul Mackerras <paulus@samba.org> | 2008-05-23 16:53:23 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 16:53:23 +1000 |
commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /kernel/audit.c | |
parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
download | talos-op-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz talos-op-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip |
Merge branch 'merge' into powerpc-next
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 b7d3709cc452..e8692a5748c2 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); } /* |