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
This commit is contained in:
Linus Torvalds 2009-05-05 08:24:41 -07:00
commit a31ea2f568

View File

@ -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;