Commit a31ea2f5 authored May 05, 2009 by Linus Torvalds

Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix send_sigiotask hook

parents 0488713c 65c90bca

security/selinux/hooks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3153,7 +3153,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk,
		struct fown_struct *fown, int signum)
		{
		struct file *file;
		u32 sid = current_sid();
		u32 sid = task_sid(tsk);
		u32 perm;
		struct file_security_struct *fsec;