Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6328099 authored by James Morris's avatar James Morris
Browse files

Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next

parents f6041c1d ece38248

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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/

security/smack/smack_lsm.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

	/*