nfsd4: fix corruption on setting an ACL.

PATCH New J. Bruce Fields 1 participant 1 message May 15, 2014

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

J. Bruce Fields

author

2014-05-15 19:26 UTC #0 lore raw

PATCH 1/1 nfsd4: fix corruption on setting an ACL.

From: "J. Bruce Fields" <[email protected]>

As of 06f9cc12caa862f5bc86ebdb4f77568a4bef0167 "nfsd4: don't create unnecessary mask acl", any non-trivial ACL will be left with an unitialized entry, and a trivial ACL may write one entry beyond what's allocated.

Signed-off-by J. Bruce Fields <[email protected]>

---
 fs/nfsd/nfs4acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I'll submit this for 3.15.

fs/nfsd/nfs4acl.c +1 -1

index c06cad5e..f69f56b 100644
@@ -590,7 +590,7 @@ posix_state_to_acl(struct posix_acl_state *state, unsigned int flags)
 		add_to_mask(state, &state->groups->aces[i].perms);
 	}
 
-	if (!state->users->n && !state->groups->n) {
+	if (state->users->n || state->groups->n) {
 		pace++;
 		pace->e_tag = ACL_MASK;
 		low_mode_from_nfs4(state->mask.allow, &pace->e_perm, flags);

Signature · 1 line

1.9.0