diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /security/selinux/hooks.c | |
parent | 4156e735d3abde8e9243b5d22f7999dd3fffab2e (diff) | |
parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'security/selinux/hooks.c')
-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 | ||