Attachment 148120 Details for Bug 228854 – Proposed patch

[patch] Proposed patch

nfsxdr.rhel-5 (text/plain), 4.37 KB, created by Peter Staubach on 2007-02-15 16:16:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Staubach

Created: 2007-02-15 16:16:29 UTC

Size: 4.37 KB

patch

obsolete

>--- linux-2.6.18.i686/fs/nfsd/nfsxdr.c.org
>+++ linux-2.6.18.i686/fs/nfsd/nfsxdr.c
>@@ -277,8 +277,9 @@ int
> nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p,
> 					struct nfsd_writeargs *args)
> {
>-	unsigned int len;
>+	unsigned int len, hdr, dlen;
> 	int v;
>+
> 	if (!(p = decode_fh(p, &args->fh)))
> 		return 0;
> 
>@@ -286,11 +287,42 @@ nfssvc_decode_writeargs(struct svc_rqst 
> 	args->offset = ntohl(*p++);	/* offset */
> 	p++;				/* totalcount */
> 	len = args->len = ntohl(*p++);
>+	/*
>+	 * The protocol specifies a maximum of NFS_MAXDATA bytes.
>+	 */
>+	if (len > NFS_MAXDATA)
>+		return 0;
>+
>+	/*
>+	 * Check to make sure that we got the right number of
>+	 * bytes.
>+	 *
>+	 * If more than one page was used, then compute the length
>+	 * of the data in the request as the total size of the
>+	 * request minus the transport protocol headers minus the
>+	 * RPC protocol headers minus the NFS protocol fields
>+	 * already consumed.  If the request fits into a single
>+	 * page, then compete the length of the data as the size
>+	 * of the NFS portion of the request minus the NFS
>+	 * protocol fields already consumed.
>+	 */
>+	hdr = (void*)p - rqstp->rq_arg.head[0].iov_base;
>+	if (rqstp->rq_argused > 1) {
>+		dlen = rqstp->rq_arg.len -
>+			(PAGE_SIZE - rqstp->rq_arg.head[0].iov_len) - hdr;
>+	} else {
>+		dlen = rqstp->rq_arg.head[0].iov_len - hdr;
>+	}
>+	/*
>+	 * Round the length of the data which was specified up to
>+	 * the next multiple of XDR units and then compare that
>+	 * against the length which was actually received.
>+	 */
>+	if (dlen != ((len + 3) & ~0x3))
>+		return 0;
>+
> 	args->vec[0].iov_base = (void*)p;
>-	args->vec[0].iov_len = rqstp->rq_arg.head[0].iov_len -
>-				(((void*)p) - rqstp->rq_arg.head[0].iov_base);
>-	if (len > NFSSVC_MAXBLKSIZE)
>-		len = NFSSVC_MAXBLKSIZE;
>+	args->vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr;
> 	v = 0;
> 	while (len > args->vec[v].iov_len) {
> 		len -= args->vec[v].iov_len;
>@@ -299,8 +331,8 @@ nfssvc_decode_writeargs(struct svc_rqst 
> 		args->vec[v].iov_len = PAGE_SIZE;
> 	}
> 	args->vec[v].iov_len = len;
>-	args->vlen = v+1;
>-	return args->vec[0].iov_len > 0;
>+	args->vlen = v + 1;
>+	return 1;
> }
> 
> int
>--- linux-2.6.18.i686/fs/nfsd/nfs3xdr.c.org
>+++ linux-2.6.18.i686/fs/nfsd/nfs3xdr.c
>@@ -358,7 +358,7 @@ int
> nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p,
> 					struct nfsd3_writeargs *args)
> {
>-	unsigned int len, v, hdr;
>+	unsigned int len, v, hdr, dlen;
> 
> 	if (!(p = decode_fh(p, &args->fh))
> 	 || !(p = xdr_decode_hyper(p, &args->offset)))
>@@ -367,18 +367,47 @@ nfs3svc_decode_writeargs(struct svc_rqst
> 	args->count = ntohl(*p++);
> 	args->stable = ntohl(*p++);
> 	len = args->len = ntohl(*p++);
>+	/*
>+	 * The count must equal the amount of data passed.
>+	 */
>+	if (args->count != args->len)
>+		return 0;
> 
>+	/*
>+	 * Check to make sure that we got the right number of
>+	 * bytes.
>+	 *
>+	 * If more than one page was used, then compute the length
>+	 * of the data in the request as the total size of the
>+	 * request minus the transport protocol headers minus the
>+	 * RPC protocol headers minus the NFS protocol fields
>+	 * already consumed.  If the request fits into a single
>+	 * page, then compete the length of the data as the size
>+	 * of the NFS portion of the request minus the NFS
>+	 * protocol fields already consumed.
>+	 */
> 	hdr = (void*)p - rqstp->rq_arg.head[0].iov_base;
>-	if (rqstp->rq_arg.len < hdr ||
>-	    rqstp->rq_arg.len - hdr < len)
>+	if (rqstp->rq_argused > 1) {
>+		dlen = rqstp->rq_arg.len -
>+			(PAGE_SIZE - rqstp->rq_arg.head[0].iov_len) - hdr;
>+	} else {
>+		dlen = rqstp->rq_arg.head[0].iov_len - hdr;
>+	}
>+	/*
>+	 * Round the length of the data which was specified up to
>+	 * the next multiple of XDR units and then compare that
>+	 * against the length which was actually received.
>+	 */
>+	if (dlen != ((len + 3) & ~0x3))
> 		return 0;
> 
>+	if (args->count > NFSSVC_MAXBLKSIZE) {
>+		args->count = NFSSVC_MAXBLKSIZE;
>+		len = args->len = NFSSVC_MAXBLKSIZE;
>+	}
> 	args->vec[0].iov_base = (void*)p;
> 	args->vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr;
>-
>-	if (len > NFSSVC_MAXBLKSIZE)
>-		len = NFSSVC_MAXBLKSIZE;
>-	v=  0;
>+	v = 0;
> 	while (len > args->vec[v].iov_len) {
> 		len -= args->vec[v].iov_len;
> 		v++;
>@@ -386,9 +415,8 @@ nfs3svc_decode_writeargs(struct svc_rqst
> 		args->vec[v].iov_len = PAGE_SIZE;
> 	}
> 	args->vec[v].iov_len = len;
>-	args->vlen = v+1;
>-
>-	return args->count == args->len && args->vec[0].iov_len > 0;
>+	args->vlen = v + 1;
>+	return 1;
> }
> 
> int

Actions: View | Diff

Attachments on bug 228854: 148120 | 155100