浏览代码

reiserfs: dont associate security.* with xattr files

 The security.* xattrs are ignored for xattr files, so don't create them.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Jeff Mahoney 16 年之前
父节点
当前提交
b82bb72ba7
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      fs/reiserfs/xattr_security.c

+ 10 - 2
fs/reiserfs/xattr_security.c

@@ -55,8 +55,16 @@ int reiserfs_security_init(struct inode *dir, struct inode *inode,
 			   struct reiserfs_security_handle *sec)
 			   struct reiserfs_security_handle *sec)
 {
 {
 	int blocks = 0;
 	int blocks = 0;
-	int error = security_inode_init_security(inode, dir, &sec->name,
-						 &sec->value, &sec->length);
+	int error;
+
+	sec->name = NULL;
+
+	/* Don't add selinux attributes on xattrs - they'll never get used */
+	if (IS_PRIVATE(dir))
+		return 0;
+
+	error = security_inode_init_security(inode, dir, &sec->name,
+					     &sec->value, &sec->length);
 	if (error) {
 	if (error) {
 		if (error == -EOPNOTSUPP)
 		if (error == -EOPNOTSUPP)
 			error = 0;
 			error = 0;