summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-07-08 10:41:15 +1000
committerJames Morris <james.l.morris@oracle.com>2016-07-08 10:41:15 +1000
commitc632809953fbde9e74394eae2de9d1f5e60ac427 (patch)
tree16103b63b53545315b0cade9e73551c6a79f661a /security
parentf6041c1d8a0825e41219a0443d365318d238d7b3 (diff)
parentece38248cfca9d1b0ba183c923f0acd2e0bf6316 (diff)
downloadlinux-c632809953fbde9e74394eae2de9d1f5e60ac427.tar.gz
linux-c632809953fbde9e74394eae2de9d1f5e60ac427.tar.bz2
linux-c632809953fbde9e74394eae2de9d1f5e60ac427.zip
Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_lsm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 722f3844286b..0cc54a02b1c6 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2227,6 +2227,9 @@ static int smack_task_kill(struct task_struct *p, struct siginfo *info,
struct smack_known *tkp = smk_of_task_struct(p);
int rc;
+ if (!sig)
+ return 0; /* null signal; existence test */
+
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
smk_ad_setfield_u_tsk(&ad, p);
/*