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

Commit 55bb55dc authored by Frank Filz's avatar Frank Filz Committed by J. Bruce Fields
Browse files

nfsd: Fix unnecessary deny bits in NFSv4 ACL 



The group deny entries end up denying tcy even though tcy was just
allowed by the allow entry. This appears to be due to:
	ace->access_mask = mask_from_posix(deny, flags);
instead of:
	ace->access_mask = deny_mask_from_posix(deny, flags);

Denying a previously allowed bit has no effect, so this shouldn't affect
behavior, but it's ugly.

Signed-off-by: default avatarFrank Filz <ffilzlnx@us.ibm.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 8f55f3c0

fs/nfsd/nfs4acl.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ _posix_to_nfsv4_one(struct posix_acl *pacl, struct nfs4_acl *acl, 
		if (deny) {

			ace->type = NFS4_ACE_ACCESS_DENIED_ACE_TYPE;

			ace->flag = eflag | NFS4_ACE_IDENTIFIER_GROUP;

			ace->access_mask = mask_from_posix(deny, flags);

			ace->access_mask = deny_mask_from_posix(deny, flags);

			ace->whotype = NFS4_ACL_WHO_NAMED;

			ace->who = pa->e_id;

			ace++;