[pnfs] CVS: nfsv4

Benny Halevy Panasas bhalevy at citi.umich.edu
Wed Feb 21 13:09:28 EST 2007


CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.umich.edu	2007/02/21 13:09:28

Modified files:
	cvs/pnfs/fs/nfsd: nfs4xdr.c 

Log message:
* nfsd xdr: read the layout commit update buffer
only when update length is greater than zero

Signed-off-by: Benny Halevy <bhalevy at panasas.com>

Index: fs/nfsd/nfs4xdr.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4xdr.c,v
retrieving revision 1.36
diff -d -u -p -r1.36 nfs4xdr.c
--- fs/nfsd/nfs4xdr.c	21 Feb 2007 17:05:19 -0000	1.36
+++ fs/nfsd/nfs4xdr.c	21 Feb 2007 17:32:24 -0000
@@ -1268,8 +1268,10 @@ nfsd4_decode_layoutcommit(struct nfsd4_c
* do not use the layout update....
*/
READ32(lcp->lc_loup.up_len);
-	READ_BUF(lcp->lc_loup.up_len);
-	READMEM(lcp->lc_loup.up_layout, lcp->lc_loup.up_len);
+	if (lcp->lc_loup.up_len > 0) {
+		READ_BUF(lcp->lc_loup.up_len);
+		READMEM(lcp->lc_loup.up_layout, lcp->lc_loup.up_len);
+	}

DECODE_TAIL;
}



More information about the pNFS mailing list