Commit 2830ba7f authored by Al Viro's avatar Al Viro
Browse files

->permission() sanitizing: don't pass flags to generic_permission() 



redundant; all callers get it duplicated in mask & MAY_NOT_BLOCK and none of
them removes that bit.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7e40145e

fs/afs/security.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ int afs_permission(struct inode *inode, int mask, unsigned int flags) 
	}



	key_put(key);

	ret = generic_permission(inode, mask, flags);

	ret = generic_permission(inode, mask);

	_leave(" = %d", ret);

	return ret;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -7339,7 +7339,7 @@ static int btrfs_permission(struct inode *inode, int mask, unsigned int flags) 
		return -EROFS;

	if ((BTRFS_I(inode)->flags & BTRFS_INODE_READONLY) && (mask & MAY_WRITE))

		return -EACCES;

	return generic_permission(inode, mask, flags);

	return generic_permission(inode, mask);

}



static const struct inode_operations btrfs_dir_inode_operations = {

fs/ceph/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1805,7 +1805,7 @@ int ceph_permission(struct inode *inode, int mask, unsigned int flags) 
	err = ceph_do_getattr(inode, CEPH_CAP_AUTH_SHARED);



	if (!err)

		err = generic_permission(inode, mask, flags);

		err = generic_permission(inode, mask);

	return err;

}

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int cifs_permission(struct inode *inode, int mask, unsigned int flags) 
		on the client (above and beyond ACL on servers) for

		servers which do not support setting and viewing mode bits,

		so allowing client to check permissions is useful */

		return generic_permission(inode, mask, flags);

		return generic_permission(inode, mask);

}



static struct kmem_cache *cifs_inode_cachep;

fs/fuse/dir.c

+2 −3
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags) 
	}



	if (fc->flags & FUSE_DEFAULT_PERMISSIONS) {

		err = generic_permission(inode, mask, flags);

		err = generic_permission(inode, mask);



		/* If permission is denied, try to refresh file

		   attributes.  This is also needed, because the root
@@ -1026,8 +1026,7 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags) 
		if (err == -EACCES && !refreshed) {

			err = fuse_perm_getattr(inode, flags);

			if (!err)

				err = generic_permission(inode, mask,

							flags);

				err = generic_permission(inode, mask);

		}



		/* Note: the opposite of the above test does not