diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 11:24:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 11:24:41 -0400 |
commit | a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69 (patch) | |
tree | fe8766f145384c86f37d639236741774ca53fc0d | |
parent | 0488713c1eeff06e497e2e54ffb2795b447e8983 (diff) | |
parent | 65c90bca0dba56f60dc4ce2a529140c3cc440f22 (diff) |
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
-rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ba808ef6babb..2fcad7c33eaf 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -3153,7 +3153,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk, | |||
3153 | struct fown_struct *fown, int signum) | 3153 | struct fown_struct *fown, int signum) |
3154 | { | 3154 | { |
3155 | struct file *file; | 3155 | struct file *file; |
3156 | u32 sid = current_sid(); | 3156 | u32 sid = task_sid(tsk); |
3157 | u32 perm; | 3157 | u32 perm; |
3158 | struct file_security_struct *fsec; | 3158 | struct file_security_struct *fsec; |
3159 | 3159 | ||