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

Commit 002ef1dc authored by Ryan O'Hara's avatar Ryan O'Hara Committed by Steven Whitehouse
Browse files

[GFS2] remove unnecessary permission checks 



Remove read/write permission() checks from xattr operations.
VFS layer is already handling permission for xattrs via the
xattr_permission() call, so there is no need for gfs2 to
check permissions. Futhermore, using permission() for SELinux
xattrs ops is incorrect.

Signed-off-by: default avatarRyan O'Hara <rohara@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 1a2781cf

fs/gfs2/eaops.c

+0 −30
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ unsigned int gfs2_ea_name2type(const char *name, const char **truncated_name) 
static int user_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)

{

	struct inode *inode = &ip->i_inode;

	int error = permission(inode, MAY_READ, NULL);

	if (error)

		return error;



	return gfs2_ea_get_i(ip, er);

}
@@ -70,14 +67,6 @@ static int user_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
{

	struct inode *inode = &ip->i_inode;



	if (S_ISREG(inode->i_mode) ||

	    (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {

		int error = permission(inode, MAY_WRITE, NULL);

		if (error)

			return error;

	} else

		return -EPERM;



	return gfs2_ea_set_i(ip, er);

}
@@ -85,14 +74,6 @@ static int user_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
{

	struct inode *inode = &ip->i_inode;



	if (S_ISREG(inode->i_mode) ||

	    (S_ISDIR(inode->i_mode) && !(inode->i_mode & S_ISVTX))) {

		int error = permission(inode, MAY_WRITE, NULL);

		if (error)

			return error;

	} else

		return -EPERM;



	return gfs2_ea_remove_i(ip, er);

}
@@ -108,8 +89,6 @@ static int system_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
	     GFS2_ACL_IS_DEFAULT(er->er_name, er->er_name_len)))

		return -EOPNOTSUPP;







	return gfs2_ea_get_i(ip, er);

}
@@ -173,9 +152,6 @@ static int system_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
static int security_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er)

{

	struct inode *inode = &ip->i_inode;

	int error = permission(inode, MAY_READ, NULL);

	if (error)

		return error;



	return gfs2_ea_get_i(ip, er);

}
@@ -183,9 +159,6 @@ static int security_eo_get(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
static int security_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er)

{

	struct inode *inode = &ip->i_inode;

	int error = permission(inode, MAY_WRITE, NULL);

	if (error)

		return error;



	return gfs2_ea_set_i(ip, er);

}
@@ -193,9 +166,6 @@ static int security_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er) 
static int security_eo_remove(struct gfs2_inode *ip, struct gfs2_ea_request *er)

{

	struct inode *inode = &ip->i_inode;

	int error = permission(inode, MAY_WRITE, NULL);

	if (error)

		return error;



	return gfs2_ea_remove_i(ip, er);

}