Merge branch 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] Audit Filter Performance
  [PATCH] Rework of IPC auditing
  [PATCH] More user space subject labels
  [PATCH] Reworked patch for labels on user space messages
  [PATCH] change lspp ipc auditing
  [PATCH] audit inode patch
  [PATCH] support for context based audit filtering, part 2
  [PATCH] support for context based audit filtering
  [PATCH] no need to wank with task_lock() and pinning task down in audit_syscall_exit()
  [PATCH] drop task argument of audit_syscall_{entry,exit}
  [PATCH] drop gfp_mask in audit_log_exit()
  [PATCH] move call of audit_free() into do_exit()
  [PATCH] sockaddr patch
  [PATCH] deal with deadlocks in audit_free()

1 files changed, 7 insertions, 6 deletions

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index ac5d69bb3377..a300702da527 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -800,7 +800,7 @@ out:
 int avc_ss_reset(u32 seqno)
 {
         struct avc_callback_node *c;
-        int i, rc = 0;
+        int i, rc = 0, tmprc;
         unsigned long flag;
         struct avc_node *node;
 
@@ -813,15 +813,16 @@ int avc_ss_reset(u32 seqno)
 
         for (c = avc_callbacks; c; c = c->next) {
                 if (c->events & AVC_CALLBACK_RESET) {
-                        rc = c->callback(AVC_CALLBACK_RESET,
-                                         0, 0, 0, 0, NULL);
-                        if (rc)
-                                goto out;
+                        tmprc = c->callback(AVC_CALLBACK_RESET,
+                                            0, 0, 0, 0, NULL);
+                        /* save the first error encountered for the return
+                           value and continue processing the callbacks */
+                        if (!rc)
+                                rc = tmprc;
                 }
         }
 
         avc_latest_notif_update(seqno, 0);
-out:
         return rc;
 }