summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-05-31 05:11:33 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-05-31 05:11:33 -0700
commit9b371fc84dec7d55e9f98c637331388da5f9c942 (patch)
tree9a0715cc86a2563352df4246697dfbe003c84ea8
parente4a7e7dbaaf40e4eb753a88d5006db82afc7910a (diff)
parentad60f0e7355900da8ae3c1ab96a557dbc747b233 (diff)
Merge "audit: Checks valid value of audit_signals and tsk->audit_context"
-rw-r--r--kernel/auditsc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 6375465af0a7..b72f4f5616ac 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2248,10 +2248,11 @@ int __audit_signal_info(int sig, struct task_struct *t)
audit_sig_uid = uid;
security_task_getsecid(tsk, &audit_sig_sid);
}
- if (!audit_signals || audit_dummy_context())
- return 0;
}
+ if (!audit_signals || audit_dummy_context())
+ return 0;
+
/* optimize the common case by putting first signal recipient directly
* in audit_context */
if (!ctx->target_pid) {