Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6

2 files changed, 15 insertions, 4 deletions

diff --git a/arch/ppc64/kernel/asm-offsets.c b/arch/ppc64/kernel/asm-offsets.c
index 17e35d0fed09..1ff4fa05a973 100644
--- a/arch/ppc64/kernel/asm-offsets.c
+++ b/arch/ppc64/kernel/asm-offsets.c
@@ -68,6 +68,7 @@ int main(void)
         DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));
 #endif /* CONFIG_ALTIVEC */
         DEFINE(MM, offsetof(struct task_struct, mm));
+        DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
 
         DEFINE(DCACHEL1LINESIZE, offsetof(struct ppc64_caches, dline_size));
         DEFINE(DCACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_dline_size));
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S
index d133a49cdf89..e8c0bbf4d000 100644
--- a/arch/ppc64/kernel/entry.S
+++ b/arch/ppc64/kernel/entry.S
@@ -276,12 +276,22 @@ _GLOBAL(ppc64_rt_sigsuspend)
 _GLOBAL(ppc32_rt_sigsuspend)
         bl      .save_nvgprs
         bl      .sys32_rt_sigsuspend
-        /* If sigsuspend() returns zero, we are going into a signal handler */
 70:     cmpdi   0,r3,0
-        beq     .ret_from_except
-        /* If it returned -EINTR, we need to return via syscall_exit to set
+        /* If it returned an error, we need to return via syscall_exit to set
            the SO bit in cr0 and potentially stop for ptrace. */
-        b       syscall_exit
+        bne     syscall_exit
+        /* If sigsuspend() returns zero, we are going into a signal handler. We
+           may need to call audit_syscall_exit() to mark the exit from sigsuspend() */
+#ifdef CONFIG_AUDIT
+        ld      r3,PACACURRENT(r13)
+        ld      r4,AUDITCONTEXT(r3)
+        cmpdi   0,r4,0
+        beq     .ret_from_except        /* No audit_context: Leave immediately. */
+        li      r4, 2                   /* AUDITSC_FAILURE */
+        li      r5,-4                   /* It's always -EINTR */
+        bl      .audit_syscall_exit
+#endif
+        b       .ret_from_except
 
 _GLOBAL(ppc_fork)
         bl      .save_nvgprs