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

Commit 47c85291 authored by NeilBrown's avatar NeilBrown Committed by J. Bruce Fields
Browse files

nfsd: correctly handle return value from nfsd_map_name_to_* 



These functions return an nfs status, not a host_err.  So don't
try to convert  before returning.

This is a regression introduced by
3c726023; I fixed up two of the callers,
but missed these two.

Cc: stable@kernel.org
Reported-by: default avatarHerbert Poetzl <herbert@13thfloor.at>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 85e2efbb

fs/nfsd/nfs4xdr.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -317,8 +317,8 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, 
		READ_BUF(dummy32);

		READ_BUF(dummy32);

		len += (XDR_QUADLEN(dummy32) << 2);

		len += (XDR_QUADLEN(dummy32) << 2);

		READMEM(buf, dummy32);

		READMEM(buf, dummy32);

		if ((host_err = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))

		if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))

			goto out_nfserr;

			return status;

		iattr->ia_valid |= ATTR_UID;

		iattr->ia_valid |= ATTR_UID;

	}

	}

	if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {

	if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {
@@ -328,8 +328,8 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, 
		READ_BUF(dummy32);

		READ_BUF(dummy32);

		len += (XDR_QUADLEN(dummy32) << 2);

		len += (XDR_QUADLEN(dummy32) << 2);

		READMEM(buf, dummy32);

		READMEM(buf, dummy32);

		if ((host_err = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))

		if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))

			goto out_nfserr;

			return status;

		iattr->ia_valid |= ATTR_GID;

		iattr->ia_valid |= ATTR_GID;

	}

	}

	if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {

	if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {