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

Commit b548edc2 authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] knfsd: nfsd4: acls: fix inheritance 



We can be a little more flexible about the flags allowed for inheritance (in
particular, we can deal with either the presence or the absence of
INHERIT_ONLY), but we should probably reject other combinations that we don't
understand.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 09229edb

fs/nfsd/nfs4acl.c

+30 −13
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \

		| NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE)



#define NFS4_SUPPORTED_FLAGS (NFS4_INHERITANCE_FLAGS | NFS4_ACE_IDENTIFIER_GROUP)



#define MASK_EQUAL(mask1, mask2) \

	( ((mask1) & NFS4_ACE_MASK_ALL) == ((mask2) & NFS4_ACE_MASK_ALL) )
@@ -721,22 +723,37 @@ nfs4_acl_split(struct nfs4_acl *acl, struct nfs4_acl *dacl) 
		    ace->type != NFS4_ACE_ACCESS_DENIED_ACE_TYPE)

			return -EINVAL;



		if ((ace->flag & NFS4_INHERITANCE_FLAGS)

				!= NFS4_INHERITANCE_FLAGS)

			continue;

		if (ace->flag & ~NFS4_SUPPORTED_FLAGS)

			return -EINVAL;



		switch (ace->flag & NFS4_INHERITANCE_FLAGS) {

		case 0:

			/* Leave this ace in the effective acl: */

			continue;

		case NFS4_INHERITANCE_FLAGS:

			/* Add this ace to the default acl and remove it

			 * from the effective acl: */

			error = nfs4_acl_add_ace(dacl, ace->type, ace->flag,

				ace->access_mask, ace->whotype, ace->who);

		if (error < 0)

			goto out;



			if (error)

				return error;

			list_del(h);

			kfree(ace);

			acl->naces--;

	}



out:

			break;

		case NFS4_INHERITANCE_FLAGS & ~NFS4_ACE_INHERIT_ONLY_ACE:

			/* Add this ace to the default, but leave it in

			 * the effective acl as well: */

			error = nfs4_acl_add_ace(dacl, ace->type, ace->flag,

				ace->access_mask, ace->whotype, ace->who);

			if (error)

				return error;

			break;

		default:

			return -EINVAL;

		}

	}

	return 0;

}



static short