1 files changed, 11 insertions, 3 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index c10e7aae04d7..972f8e61d36a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -243,6 +243,9 @@ static inline int open_arg(int flags, int mask)
 
 static int audit_match_perm(struct audit_context *ctx, int mask)
 {
+        if (unlikely(!ctx))
+                return 0;
+
         unsigned n = ctx->major;
         switch (audit_classify_syscall(ctx->arch, n)) {
         case 0: /* native */
@@ -284,6 +287,10 @@ static int audit_match_filetype(struct audit_context *ctx, int which)
 {
         unsigned index = which & ~S_IFMT;
         mode_t mode = which & S_IFMT;
+
+        if (unlikely(!ctx))
+                return 0;
+
         if (index >= ctx->name_count)
                 return 0;
         if (ctx->names[index].ino == -1)
@@ -610,7 +617,7 @@ static int audit_filter_rules(struct task_struct *tsk,
                 if (!result)
                         return 0;
         }
-        if (rule->filterkey)
+        if (rule->filterkey && ctx)
                 ctx->filterkey = kstrdup(rule->filterkey, GFP_ATOMIC);
         switch (rule->action) {
         case AUDIT_NEVER:    *state = AUDIT_DISABLED;       break;
@@ -1476,7 +1483,8 @@ void audit_syscall_entry(int arch, int major,
         struct audit_context *context = tsk->audit_context;
         enum audit_state     state;
 
-        BUG_ON(!context);
+        if (unlikely(!context))
+                return;
 
         /*
          * This happens only on certain architectures that make system
@@ -2374,7 +2382,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
         struct audit_context *ctx = tsk->audit_context;
 
         if (audit_pid && t->tgid == audit_pid) {
-                if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1) {
+                if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1 || sig == SIGUSR2) {
                         audit_sig_pid = tsk->pid;
                         if (tsk->loginuid != -1)
                                 audit_sig_uid = tsk->loginuid;