diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-07-08 10:41:15 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-08 10:41:15 +1000 |
| commit | c632809953fbde9e74394eae2de9d1f5e60ac427 (patch) | |
| tree | 16103b63b53545315b0cade9e73551c6a79f661a | |
| parent | f6041c1d8a0825e41219a0443d365318d238d7b3 (diff) | |
| parent | ece38248cfca9d1b0ba183c923f0acd2e0bf6316 (diff) | |
Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | security/smack/smack_lsm.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7227c791004f..a296727b6ff2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10530,7 +10530,7 @@ SMACK SECURITY MODULE M: Casey Schaufler <casey@schaufler-ca.com> L: linux-security-module@vger.kernel.org W: http://schaufler-ca.com -T: git git://git.gitorious.org/smack-next/kernel.git +T: git git://github.com/cschaufler/smack-next S: Maintained F: Documentation/security/Smack.txt F: security/smack/ 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); /* |