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

Commit 11e39d99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux:
  nfsd4: bug in read_buf
parents 03449cd9 2bc3c117

fs/nfsd/nfs4xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -161,10 +161,10 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) 
	argp->p = page_address(argp->pagelist[0]);

	argp->pagelist++;

	if (argp->pagelen < PAGE_SIZE) {

		argp->end = p + (argp->pagelen>>2);

		argp->end = argp->p + (argp->pagelen>>2);

		argp->pagelen = 0;

	} else {

		argp->end = p + (PAGE_SIZE>>2);

		argp->end = argp->p + (PAGE_SIZE>>2);

		argp->pagelen -= PAGE_SIZE;

	}

	memcpy(((char*)p)+avail, argp->p, (nbytes - avail));
@@ -1426,10 +1426,10 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
			argp->p = page_address(argp->pagelist[0]);

			argp->pagelist++;

			if (argp->pagelen < PAGE_SIZE) {

				argp->end = p + (argp->pagelen>>2);

				argp->end = argp->p + (argp->pagelen>>2);

				argp->pagelen = 0;

			} else {

				argp->end = p + (PAGE_SIZE>>2);

				argp->end = argp->p + (PAGE_SIZE>>2);

				argp->pagelen -= PAGE_SIZE;

			}

		}