From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: [PATCH 4/8] remove ext2 xattr permission checks
Date: Tue, 1 Nov 2005 03:30:41 +0100
Message-ID: <20051101023041.GD23378@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: linux-fsdevel@vger.kernel.org
Return-path: <linux-fsdevel-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.210]:16554 "EHLO mail.lst.de")
	by vger.kernel.org with ESMTP id S964879AbVKACaq (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Mon, 31 Oct 2005 21:30:46 -0500
To: akpm@osdl.org
Content-Disposition: inline
Sender: linux-fsdevel-owner@vger.kernel.org
List-Id: linux-fsdevel.vger.kernel.org

remove checks now in the VFS


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6/fs/ext2/xattr.c
===================================================================
--- linux-2.6.orig/fs/ext2/xattr.c	2005-10-30 19:54:21.000000000 +0100
+++ linux-2.6/fs/ext2/xattr.c	2005-10-30 19:55:57.000000000 +0100
@@ -389,10 +389,6 @@
 	ea_idebug(inode, "name=%d.%s, value=%p, value_len=%ld",
 		  name_index, name, value, (long)value_len);
 
-	if (IS_RDONLY(inode))
-		return -EROFS;
-	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-		return -EPERM;
 	if (value == NULL)
 		value_len = 0;
 	if (name == NULL)
Index: linux-2.6/fs/ext2/xattr_trusted.c
===================================================================
--- linux-2.6.orig/fs/ext2/xattr_trusted.c	2005-10-30 19:54:21.000000000 +0100
+++ linux-2.6/fs/ext2/xattr_trusted.c	2005-10-30 19:55:25.000000000 +0100
@@ -38,8 +38,6 @@
 {
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
 	return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name,
 			      buffer, size);
 }
@@ -50,8 +48,6 @@
 {
 	if (strcmp(name, "") == 0)
 		return -EINVAL;
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
 	return ext2_xattr_set(inode, EXT2_XATTR_INDEX_TRUSTED, name,
 			      value, size, flags);
 }
Index: linux-2.6/fs/ext2/xattr_user.c
===================================================================
--- linux-2.6.orig/fs/ext2/xattr_user.c	2005-10-30 19:54:21.000000000 +0100
+++ linux-2.6/fs/ext2/xattr_user.c	2005-10-30 19:55:51.000000000 +0100
@@ -41,10 +41,6 @@
 		return -EINVAL;
 	if (!test_opt(inode->i_sb, XATTR_USER))
 		return -EOPNOTSUPP;
-	error = permission(inode, MAY_READ, NULL);
-	if (error)
-		return error;
-
 	return ext2_xattr_get(inode, EXT2_XATTR_INDEX_USER, name, buffer, size);
 }
 
@@ -58,12 +54,6 @@
 		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 ext2_xattr_set(inode, EXT2_XATTR_INDEX_USER, name,
 			      value, size, flags);