[PATCH] remove ext3 xattr permission checks (c37ef806) · Commits · 戴 / test

fs/ext3/xattr.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -946,10 +946,6 @@ ext3_xattr_set_handle(handle_t handle, struct inode inode, int name_index,
		};
		int error;

		if (IS_RDONLY(inode))
		return -EROFS;
		if (IS_IMMUTABLE(inode) \|\| IS_APPEND(inode))
		return -EPERM;
		if (!name)
		return -EINVAL;
		if (strlen(name) > 255)

+0 −4

Original line number	Diff line number	Diff line
		@@ -39,8 +39,6 @@ ext3_xattr_trusted_get(struct inode inode, const char name,
		{
		if (strcmp(name, "") == 0)
		return -EINVAL;
		if (!capable(CAP_SYS_ADMIN))
		return -EPERM;
		return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name,
		buffer, size);
		}
		@@ -51,8 +49,6 @@ ext3_xattr_trusted_set(struct inode inode, const char name,
		{
		if (strcmp(name, "") == 0)
		return -EINVAL;
		if (!capable(CAP_SYS_ADMIN))
		return -EPERM;
		return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name,
		value, size, flags);
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -37,16 +37,10 @@ static int
		ext3_xattr_user_get(struct inode inode, const char name,
		void *buffer, size_t size)
		{
		int error;

		if (strcmp(name, "") == 0)
		return -EINVAL;
		if (!test_opt(inode->i_sb, XATTR_USER))
		return -EOPNOTSUPP;
		error = permission(inode, MAY_READ, NULL);
		if (error)
		return error;

		return ext3_xattr_get(inode, EXT3_XATTR_INDEX_USER, name, buffer, size);
		}

		@@ -54,19 +48,10 @@ static int
		ext3_xattr_user_set(struct inode inode, const char name,
		const void *value, size_t size, int flags)
		{
		int error;

		if (strcmp(name, "") == 0)
		return -EINVAL;
		if (!test_opt(inode->i_sb, XATTR_USER))
		return -EOPNOTSUPP;
		if ( !S_ISREG(inode->i_mode) &&
		(!S_ISDIR(inode->i_mode) \|\| inode->i_mode & S_ISVTX))
		return -EPERM;
		error = permission(inode, MAY_WRITE, NULL);
		if (error)
		return error;

		return ext3_xattr_set(inode, EXT3_XATTR_INDEX_USER, name,
		value, size, flags);
		}