Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus

2011-05-04 11:59:34 +10:00
parent 609cfda586 bf69d41d19
commit 6f23928454
5 changed files with 26 additions and 13 deletions
--- 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;
 	}