Commit bae78dc2 authored Jul 11, 2014 by Linus Torvalds

linux

Pull nfsd bugfix from Bruce Fields:
 "Another xdr encoding regression that may cause incorrect encoding on
  failures of certain readdirs"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix bad reserving space for encoding rdattr_error

parents ef24209f c3a45617

fs/nfsd/nfs4xdr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2641,7 +2641,7 @@ nfsd4_encode_rdattr_error(struct xdr_stream *xdr, __be32 nfserr)
		{
		__be32 *p;

		p = xdr_reserve_space(xdr, 6);
		p = xdr_reserve_space(xdr, 20);
		if (!p)
		return NULL;
		*p++ = htonl(2);