From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: [PATCH 5/8] remove ext3 xattr permission checks
Date: Tue, 1 Nov 2005 03:30:47 +0100
Message-ID: <20051101023047.GE23378@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]:17834 "EHLO mail.lst.de")
	by vger.kernel.org with ESMTP id S964945AbVKACax (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Mon, 31 Oct 2005 21:30:53 -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/ext3/xattr.c
===================================================================
--- linux-2.6.orig/fs/ext3/xattr.c	2005-08-11 16:46:02.000000000 +0200
+++ linux-2.6/fs/ext3/xattr.c	2005-10-30 19:56:49.000000000 +0100
@@ -946,10 +946,6 @@
 	};
 	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)
Index: linux-2.6/fs/ext3/xattr_trusted.c
===================================================================
--- linux-2.6.orig/fs/ext3/xattr_trusted.c	2005-08-11 16:46:02.000000000 +0200
+++ linux-2.6/fs/ext3/xattr_trusted.c	2005-10-30 19:57:56.000000000 +0100
@@ -39,8 +39,6 @@
 {
 	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 @@
 {
 	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);
 }
Index: linux-2.6/fs/ext3/xattr_user.c
===================================================================
--- linux-2.6.orig/fs/ext3/xattr_user.c	2005-08-11 16:46:02.000000000 +0200
+++ linux-2.6/fs/ext3/xattr_user.c	2005-10-30 19:58:15.000000000 +0100
@@ -37,16 +37,10 @@
 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 @@
 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);
 }