2 files changed, 8 insertions, 8 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);
 }
 
 /*
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 9ef5e0aacc3c..f7921a2ecf16 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -172,10 +172,9 @@ static void insert_hash(struct audit_chunk *chunk)
 struct audit_chunk *audit_tree_lookup(const struct inode *inode)
 {
         struct list_head *list = chunk_hash(inode);
-        struct list_head *pos;
+        struct audit_chunk *p;
 
-        list_for_each_rcu(pos, list) {
-                struct audit_chunk *p = container_of(pos, struct audit_chunk, hash);
+        list_for_each_entry_rcu(p, list, hash) {
                 if (p->watch.inode == inode) {
                         get_inotify_watch(&p->watch);
                         return p;