Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f6e59ae authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

vfs: Use IOP_XATTR flag for bad-inode handling 



With this change, all the xattr handler based operations will produce an
-EIO result for bad inodes, and we no longer only depend on inode->i_op
to be set to bad_inode_ops.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d0a5b995

fs/bad_inode.c

+1 −20
Original line number Diff line number Diff line
@@ -100,29 +100,12 @@ static int bad_inode_setattr(struct dentry *direntry, struct iattr *attrs) 
	return -EIO;

}



static int bad_inode_setxattr(struct dentry *dentry, struct inode *inode,

		const char *name, const void *value, size_t size, int flags)

{

	return -EIO;

}



static ssize_t bad_inode_getxattr(struct dentry *dentry, struct inode *inode,

			const char *name, void *buffer, size_t size)

{

	return -EIO;

}



static ssize_t bad_inode_listxattr(struct dentry *dentry, char *buffer,

			size_t buffer_size)

{

	return -EIO;

}



static int bad_inode_removexattr(struct dentry *dentry, const char *name)

{

	return -EIO;

}



static const struct inode_operations bad_inode_ops =

{

	.create		= bad_inode_create,
@@ -142,10 +125,7 @@ static const struct inode_operations bad_inode_ops = 
	.permission	= bad_inode_permission,

	.getattr	= bad_inode_getattr,

	.setattr	= bad_inode_setattr,

	.setxattr	= bad_inode_setxattr,

	.getxattr	= bad_inode_getxattr,

	.listxattr	= bad_inode_listxattr,

	.removexattr	= bad_inode_removexattr,

};
@@ -175,6 +155,7 @@ void make_bad_inode(struct inode *inode) 
	inode->i_atime = inode->i_mtime = inode->i_ctime =

		current_fs_time(inode->i_sb);

	inode->i_op = &bad_inode_ops;	

	inode->i_opflags &= ~IOP_XATTR;

	inode->i_fop = &bad_file_ops;	

}

EXPORT_SYMBOL(make_bad_inode);

fs/xattr.c

+7 −1
Original line number Diff line number Diff line
@@ -58,8 +58,11 @@ xattr_resolve_name(struct inode *inode, const char **name) 
	const struct xattr_handler **handlers = inode->i_sb->s_xattr;

	const struct xattr_handler *handler;



	if (!(inode->i_opflags & IOP_XATTR))

	if (!(inode->i_opflags & IOP_XATTR)) {

		if (unlikely(is_bad_inode(inode)))

			return ERR_PTR(-EIO);

		return ERR_PTR(-EOPNOTSUPP);

	}

	for_each_xattr_handler(handlers, handler) {

		const char *n;
@@ -168,6 +171,9 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name, 
		}

	} else if (issec) {

		const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;



		if (unlikely(is_bad_inode(inode)))

			return -EIO;

		error = security_inode_setsecurity(inode, suffix, value,

						   size, flags);

		if (!error)