summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 17:24:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 17:24:41 +0200
commita31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69 (patch)
treefe8766f145384c86f37d639236741774ca53fc0d
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff)
parentselinux: Fix send_sigiotask hook (diff)
downloadlinux-a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69.tar.xz
linux-a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69.zip
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.c2
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,
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;