diff options
author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /security/selinux | |
parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) |
Merge branch 'master' into next
Diffstat (limited to 'security/selinux')
-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 39046ddd90a9..195906bce266 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -3145,7 +3145,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk, | |||
3145 | struct fown_struct *fown, int signum) | 3145 | struct fown_struct *fown, int signum) |
3146 | { | 3146 | { |
3147 | struct file *file; | 3147 | struct file *file; |
3148 | u32 sid = current_sid(); | 3148 | u32 sid = task_sid(tsk); |
3149 | u32 perm; | 3149 | u32 perm; |
3150 | struct file_security_struct *fsec; | 3150 | struct file_security_struct *fsec; |
3151 | 3151 | ||