Commit a31ea2f5 authored by Linus Torvalds's avatar 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
...@@ -3153,7 +3153,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk, ...@@ -3153,7 +3153,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk,
struct fown_struct *fown, int signum) struct fown_struct *fown, int signum)
{ {
struct file *file; struct file *file;
u32 sid = current_sid(); u32 sid = task_sid(tsk);
u32 perm; u32 perm;
struct file_security_struct *fsec; struct file_security_struct *fsec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment