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

Commit 82e13c71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd bugfix from Bruce Fields:
 "Another regression from the xdr encoding rewrite"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  NFSD: Fix crash encoding lock reply on 32-bit
parents 98de5ab7 f98bac5a

fs/nfsd/nfs4xdr.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2879,6 +2879,7 @@ nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld) 
		 * return the conflicting open:

		 * return the conflicting open:

		 */

		 */

		if (conf->len) {

		if (conf->len) {

			kfree(conf->data);

			conf->len = 0;

			conf->len = 0;

			conf->data = NULL;

			conf->data = NULL;

			goto again;

			goto again;
@@ -2891,6 +2892,7 @@ nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld) 
	if (conf->len) {

	if (conf->len) {

		p = xdr_encode_opaque_fixed(p, &ld->ld_clientid, 8);

		p = xdr_encode_opaque_fixed(p, &ld->ld_clientid, 8);

		p = xdr_encode_opaque(p, conf->data, conf->len);

		p = xdr_encode_opaque(p, conf->data, conf->len);

		kfree(conf->data);

	}  else {  /* non - nfsv4 lock in conflict, no clientid nor owner */

	}  else {  /* non - nfsv4 lock in conflict, no clientid nor owner */

		p = xdr_encode_hyper(p, (u64)0); /* clientid */

		p = xdr_encode_hyper(p, (u64)0); /* clientid */

		*p++ = cpu_to_be32(0); /* length of owner name */

		*p++ = cpu_to_be32(0); /* length of owner name */
@@ -2907,7 +2909,7 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lo 
		nfserr = nfsd4_encode_stateid(xdr, &lock->lk_resp_stateid);

		nfserr = nfsd4_encode_stateid(xdr, &lock->lk_resp_stateid);

	else if (nfserr == nfserr_denied)

	else if (nfserr == nfserr_denied)

		nfserr = nfsd4_encode_lock_denied(xdr, &lock->lk_denied);

		nfserr = nfsd4_encode_lock_denied(xdr, &lock->lk_denied);

	kfree(lock->lk_denied.ld_owner.data);



	return nfserr;

	return nfserr;

}

}