Attachment 148897 Details for Bug 230311 – patch of this bug

[patch] patch of this bug

nfs3_readdir.patch (text/plain), 1.86 KB, created by yjwei on 2007-02-28 06:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yjwei

Created: 2007-02-28 06:10:05 UTC

Size: 1.86 KB

patch

obsolete

>--- linux-2.6.18.i686/fs/nfsd/nfs3proc.c.orig	2007-02-13 01:37:43.000000000 -0500
>+++ linux-2.6.18.i686/fs/nfsd/nfs3proc.c	2007-02-13 13:29:59.000000000 -0500
>@@ -421,6 +421,13 @@ nfsd3_proc_link(struct svc_rqst *rqstp, 
> }
> 
> /*
>+ * The readdir ok reply requires at least (1 + 21)(post_op_attr) 
>+ * + 2(cookieverf3) + 1(NULL entry ptr) + 1(eof flag) words, 
>+ * the maximum size of this is limited by count argument
>+ */
>+#define NFS3_READDIR_BAGGAGE	(1 + 21 + 2 + 1 + 1)
>+
>+/*
>  * Read a portion of a directory.
>  */
> static int
>@@ -433,13 +440,16 @@ nfsd3_proc_readdir(struct svc_rqst *rqst
> 				SVCFH_fmt(&argp->fh),
> 				argp->count, (u32) argp->cookie);
> 
>-	/* Make sure we've room for the NULL ptr & eof flag, and shrink to
>-	 * client read size */
>-	count = (argp->count >> 2) - 2;
>-
> 	/* Read directory and encode entries on the fly */
> 	fh_copy(&resp->fh, &argp->fh);
> 
>+	/* Make sure we've room for the attr, verf, NULL ptr & eof flag, 
>+         * and shrink to client read size */
>+	count = (argp->count >> 2) - NFS3_READDIR_BAGGAGE;
>+
>+	if(count < 0) 
>+		RETURN_STATUS(nfserr_toosmall);
>+	
> 	resp->buflen = count;
> 	resp->common.err = nfs_ok;
> 	resp->buffer = argp->buffer;
>@@ -471,13 +481,16 @@ nfsd3_proc_readdirplus(struct svc_rqst *
> 				SVCFH_fmt(&argp->fh),
> 				argp->count, (u32) argp->cookie);
> 
>-	/* Convert byte count to number of words (i.e. >> 2),
>-	 * and reserve room for the NULL ptr & eof flag (-2 words) */
>-	resp->count = (argp->count >> 2) - 2;
>-
> 	/* Read directory and encode entries on the fly */
> 	fh_copy(&resp->fh, &argp->fh);
> 
>+	/* Convert byte count to number of words (i.e. >> 2),
>+	 * and reserve room for the attr, verf, NULL ptr & eof flag */
>+	resp->count = (argp->count >> 2) - NFS3_READDIR_BAGGAGE;
>+
>+	if(resp->count < 0) 
>+		RETURN_STATUS(nfserr_toosmall);
>+
> 	resp->common.err = nfs_ok;
> 	resp->buffer = argp->buffer;
> 	resp->buflen = resp->count;

Actions: View | Diff

Attachments on bug 230311: 148897