diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-10 17:05:24 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-10 17:05:45 +0200 |
commit | 932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch) | |
tree | 11b1afac3a40d253cdb905c42901edfaae5e196e /security/selinux/hooks.c | |
parent | 57d524154ffe99d27fb55e0e30ddbad9f4c35806 (diff) | |
parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
download | kernel_samsung_espresso10-932fed4e2e42c3d730c01bb63b1c4f812c533d5b.zip kernel_samsung_espresso10-932fed4e2e42c3d730c01bb63b1c4f812c533d5b.tar.gz kernel_samsung_espresso10-932fed4e2e42c3d730c01bb63b1c4f812c533d5b.tar.bz2 |
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; } |