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

Commit ee715087 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
  nfsd: correctly handle return value from nfsd_map_name_to_*
parents 68ac01a2 47c85291

fs/nfsd/nfs4xdr.c

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

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

		READMEM(buf, dummy32);

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

			goto out_nfserr;

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

			return status;

		iattr->ia_valid |= ATTR_UID;

	}

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

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

		READMEM(buf, dummy32);

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

			goto out_nfserr;

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

			return status;

		iattr->ia_valid |= ATTR_GID;

	}

	if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {