diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-06 06:11:28 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-06 06:11:28 (GMT) |
commit | 4d70230bb46859df6295744f7dcf8c560f01fb8f (patch) | |
tree | a5b0f219c2f90365136a00b555fdd4fcc07ed3bf /security/selinux/hooks.c | |
parent | 98bb318864ed10ae374573f1382147f113642059 (diff) | |
parent | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (diff) | |
download | linux-4d70230bb46859df6295744f7dcf8c560f01fb8f.tar.xz |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into perf/urgent
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r-- | security/selinux/hooks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f7cf0ea..8fb2488 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1578,7 +1578,8 @@ static int may_create(struct inode *dir, return rc; if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) { - rc = security_transition_sid(sid, dsec->sid, tclass, NULL, &newsid); + rc = security_transition_sid(sid, dsec->sid, tclass, + &dentry->d_name, &newsid); if (rc) return rc; } |