diff options
| author | James Morris <[email protected]> | 2011-05-04 01:59:34 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2011-05-04 01:59:34 +0000 |
| commit | 6f239284542bae297d27355d06afbb8df23c5db9 (patch) | |
| tree | b0ba42fb54cd05178c61584e0913be38a57f0384 /security/selinux/hooks.c | |
| parent | Merge branch 'stable/bug-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | flex_arrays: allow zero length flex arrays (diff) | |
| download | kernel-6f239284542bae297d27355d06afbb8df23c5db9.tar.gz kernel-6f239284542bae297d27355d06afbb8df23c5db9.zip | |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
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 f7cf0ea6faea..8fb248843009 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; } |