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

Commit 9c2c7039 authored by Al Viro's avatar Al Viro
Browse files

->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl() 



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

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int v9fs_check_acl(struct inode *inode, int mask, unsigned int flags) 
	struct posix_acl *acl;

	struct v9fs_session_info *v9ses;



	if (flags & IPERM_FLAG_RCU)

	if (mask & MAY_NOT_BLOCK)

		return -ECHILD;



	v9ses = v9fs_inode2v9ses(inode);

fs/btrfs/acl.c

+1 −2
Original line number Diff line number Diff line
@@ -199,10 +199,9 @@ int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags) 
{

	int error = -EAGAIN;



	if (flags & IPERM_FLAG_RCU) {

	if (mask & MAY_NOT_BLOCK) {

		if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))

			error = -ECHILD;



	} else {

		struct posix_acl *acl;

		acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);

fs/ext2/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ ext2_check_acl(struct inode *inode, int mask, unsigned int flags) 
{

	struct posix_acl *acl;



	if (flags & IPERM_FLAG_RCU) {

	if (mask & MAY_NOT_BLOCK) {

		if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))

			return -ECHILD;

		return -EAGAIN;

fs/ext3/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ ext3_check_acl(struct inode *inode, int mask, unsigned int flags) 
{

	struct posix_acl *acl;



	if (flags & IPERM_FLAG_RCU) {

	if (mask & MAY_NOT_BLOCK) {

		if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))

			return -ECHILD;

		return -EAGAIN;

fs/ext4/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ ext4_check_acl(struct inode *inode, int mask, unsigned int flags) 
{

	struct posix_acl *acl;



	if (flags & IPERM_FLAG_RCU) {

	if (mask & MAY_NOT_BLOCK) {

		if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))

			return -ECHILD;

		return -EAGAIN;