diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /security/selinux/hooks.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 45c41490d521..fc774436a264 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -1986,6 +1986,9 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, | |||
| 1986 | 1986 | ||
| 1987 | inode_security_set_sid(inode, newsid); | 1987 | inode_security_set_sid(inode, newsid); |
| 1988 | 1988 | ||
| 1989 | if (sbsec->behavior == SECURITY_FS_USE_MNTPOINT) | ||
| 1990 | return -EOPNOTSUPP; | ||
| 1991 | |||
| 1989 | if (name) { | 1992 | if (name) { |
| 1990 | namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_KERNEL); | 1993 | namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_KERNEL); |
| 1991 | if (!namep) | 1994 | if (!namep) |