From af14616c1104a896aae443c2b08bc32541b5cd2a Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 8 Aug 2007 00:01:46 +0100
Subject: [PATCH] --- yaml --- r: 63735 b: refs/heads/master c:
 175fc484256e9c85e043f599ec2f6bc0d2e6c443 h: refs/heads/master i:   63733:
 3af1911dcdb786f9bb2981e05d6ae63dcc962b27   63731:
 8f1eb59ee995f666e0c77bad938e9f4b0eb4406e   63727:
 2d6b288d3fe23039325f287b52a851c72e9da76c v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/auditsc.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5465762ea1d7..cd9b34acc704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dc83afdbefd184bf29f347e8fcbb6d8a2b5e6fe
+refs/heads/master: 175fc484256e9c85e043f599ec2f6bc0d2e6c443
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
index a777d3761416..3401293359e8 100644
--- a/trunk/kernel/auditsc.c
+++ b/trunk/kernel/auditsc.c
@@ -1992,19 +1992,19 @@ int __audit_signal_info(int sig, struct task_struct *t)
 	extern uid_t audit_sig_uid;
 	extern u32 audit_sig_sid;
 
-	if (audit_pid && t->tgid == audit_pid &&
-	    (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1)) {
-		audit_sig_pid = tsk->pid;
-		if (ctx)
-			audit_sig_uid = ctx->loginuid;
-		else
-			audit_sig_uid = tsk->uid;
-		selinux_get_task_sid(tsk, &audit_sig_sid);
+	if (audit_pid && t->tgid == audit_pid) {
+		if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1) {
+			audit_sig_pid = tsk->pid;
+			if (ctx)
+				audit_sig_uid = ctx->loginuid;
+			else
+				audit_sig_uid = tsk->uid;
+			selinux_get_task_sid(tsk, &audit_sig_sid);
+		}
+		if (!audit_signals || audit_dummy_context())
+			return 0;
 	}
 
-	if (!audit_signals) /* audit_context checked in wrapper */
-		return 0;
-
 	/* optimize the common case by putting first signal recipient directly
 	 * in audit_context */
 	if (!ctx->target_pid) {