From 6031f9cac600e3cd7f859600a9674dd36c3ede59 Mon Sep 17 00:00:00 2001 From: "David P. Quigley" Date: Fri, 16 Jan 2009 09:22:04 -0500 Subject: [PATCH] --- yaml --- r: 132575 b: refs/heads/master c: cd89596f0ccfa3ccb8a81ce47782231cf7ea7296 h: refs/heads/master i: 132573: ab38cdd12959d01c6bc4ae919cadf52ee88568df 132571: 4023f42b016182a369eb236b368e0428688ca3c9 132567: 15a5a4d5eb8a3b243c8d53f81bf1a1585828c67a 132559: 6c6c8f55b9e43cac90d52efde7ceb0ef893fe8a9 132543: 14a3e09c0a12734c92ef84f77b2f1b2197c64216 v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3ae4a381e6c7..3e641f70b31a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11689d47f0957121920c9ec646eb5d838755853a +refs/heads/master: cd89596f0ccfa3ccb8a81ce47782231cf7ea7296 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 1a9768a8b644..3bb4942e39cc 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -1613,7 +1613,7 @@ static int may_create(struct inode *dir, if (rc) return rc; - if (!newsid || sbsec->behavior == SECURITY_FS_USE_MNTPOINT) { + if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) { rc = security_transition_sid(sid, dsec->sid, tclass, &newsid); if (rc) return rc; @@ -2597,7 +2597,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, sid = tsec->sid; newsid = tsec->create_sid; - if (!newsid || sbsec->behavior == SECURITY_FS_USE_MNTPOINT) { + if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) { rc = security_transition_sid(sid, dsec->sid, inode_mode_to_security_class(inode->i_mode), &newsid); @@ -2619,7 +2619,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, isec->initialized = 1; } - if (!ss_initialized || sbsec->behavior == SECURITY_FS_USE_MNTPOINT) + if (!ss_initialized || !(sbsec->flags & SE_SBLABELSUPP)) return -EOPNOTSUPP; if (name) { @@ -2796,7 +2796,7 @@ static int selinux_inode_setxattr(struct dentry *dentry, const char *name, return selinux_inode_setotherxattr(dentry, name); sbsec = inode->i_sb->s_security; - if (sbsec->behavior == SECURITY_FS_USE_MNTPOINT) + if (!(sbsec->flags & SE_SBLABELSUPP)) return -EOPNOTSUPP; if (!is_owner_or_cap(inode))