Skip to contentSkip to conversation

nfsd: return error if nfs4_setacl fails

PATCH Applied Jeff Layton 2 participants 2 messages Nov 7, 2022

Subsystems (2)
lore
Share & tools
lore

Jeff Layton

author maintainer
#0 lore raw

PATCH 1/1 nfsd: return error if nfs4_setacl fails

With the addition of POSIX ACLs to struct nfsd_attrs, we no longer return an error if setting the ACL fails. Ensure we return the na_aclerr error on SETATTR if there is one.

Fixes c0cbe70742f4 ("NFSD: add posix ACLs to struct nfsd_attrs")
Cc Neil Brown <[email protected]>
---
 fs/nfsd/nfs4proc.c | 2 ++
 1 file changed, 2 insertions(+)
fs/nfsd/nfs4proc.c +2 -0
index 6f7e0c5e62d2..a6173677b766 100644
@@ -1135,6 +1135,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 				0, (time64_t)0);
 	if (!status)
 		status = nfserrno(attrs.na_labelerr);
+	if (!status)
+		status = nfserrno(attrs.na_aclerr);
 out:
 	nfsd_attrs_free(&attrs);
 	fh_drop_write(&cstate->current_fh);
Signature · 1 line
2.38.1
#1 lore raw
Quoted 12 lines · Jeff Layton

With the addition of POSIX ACLs to struct nfsd_attrs, we no longer return an error if setting the ACL fails. Ensure we return the na_aclerr error on SETATTR if there is one.

Fixes c0cbe70742f4 ("NFSD: add posix ACLs to struct nfsd_attrs")
Cc Neil Brown <[email protected]>

Applied to nfsd's for-next tree (6.2). Thanks!

Quoted 15 lines

---
fs/nfsd/nfs4proc.c | 2 ++

1 file changed, 2 insertions(+)
fs/nfsd/nfs4proc.c +2 -0
index 6f7e0c5e62d2..a6173677b766 100644
@@ -1135,6 +1135,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 				0, (time64_t)0);
 	if (!status)
 		status = nfserrno(attrs.na_labelerr);
+	if (!status)
+		status = nfserrno(attrs.na_aclerr);

out:

Quoted 5 lines
	nfsd_attrs_free(&attrs);
	fh_drop_write(&cstate->current_fh);
Signature · 1 line
2.38.1

--
Chuck Lever