Attachment 303353 Details for Bug 428720 – clean up short packet handling for NFSv4 readdir

[patch] clean up short packet handling for NFSv4 readdir

11-bz-428720-nfs-clean-up-short-p.patch (text/plain), 3.13 KB, created by Jeff Layton on 2008-04-22 18:27:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-04-22 18:27:07 UTC

Size: 3.13 KB

patch

obsolete

>BZ#428720: NFS: clean up short packet handling for NFSv4 readdir
>
>From: Jeff Layton <jlayton@redhat.com>
>
>Currently, the NFS readdir decoders have a workaround for buggy servers
>that send an empty readdir response with the EOF bit unset. If the
>server sends a malformed response in some cases, this workaround kicks
>in and just returns an empty response rather than returning a proper
>error to the caller.
>
>This patch does 3 things:
>
>1) have malformed responses with no entries return error (-EIO)
>
>2) preserve existing workaround for servers that send empty
>   responses with the EOF marker unset.
>
>3) Add some comments to clarify the logic in decode_readdir().
>
>Signed-off-by: Jeff Layton <jlayton@redhat.com>
>---
>
> fs/nfs/nfs4xdr.c |   37 +++++++++++++++++++++++++++----------
> 1 files changed, 27 insertions(+), 10 deletions(-)
>
>
>diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
>index 43a0870..f80cd46 100644
>--- a/fs/nfs/nfs4xdr.c
>+++ b/fs/nfs/nfs4xdr.c
>@@ -3360,7 +3360,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
> 	struct xdr_buf	*rcvbuf = &req->rq_rcv_buf;
> 	struct page	*page = *rcvbuf->pages;
> 	struct kvec	*iov = rcvbuf->head;
>-	unsigned int	nr, pglen = rcvbuf->page_len;
>+	unsigned int	nr = 0, pglen = rcvbuf->page_len;
> 	uint32_t	*end, *entry, *p, *kaddr;
> 	uint32_t	len, attrlen, xlen;
> 	int 		hdrlen, recvd, status;
>@@ -3386,7 +3386,12 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
> 	kaddr = p = (uint32_t *) kmap_atomic(page, KM_USER0);
> 	end = p + ((pglen + readdir->pgbase) >> 2);
> 	entry = p;
>-	for (nr = 0; *p++; nr++) {
>+
>+	/* Make sure the packet actually has a value_follows and EOF entry */
>+	if ((entry + 1) > end)
>+		goto short_pkt;
>+
>+	for (; *p++; nr++) {
> 		if (end - p < 3)
> 			goto short_pkt;
> 		dprintk("cookie = %Lu, ", *((unsigned long long *)p));
>@@ -3411,20 +3416,32 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
> 		p += attrlen;		/* attributes */
> 		entry = p;
> 	}
>-	if (!nr && (entry[0] != 0 || entry[1] == 0))
>-		goto short_pkt;
>+	/*
>+	 * Apparently some server sends responses that are a valid size, but
>+	 * contain no entries, and have value_follows==0 and EOF==0. For
>+	 * those, just set the EOF marker.
>+	 */
>+	if (!nr && entry[1] == 0) {
>+		dprintk("NFS: readdir reply truncated!\n");
>+		entry[1] = 1;
>+	}
> out:	
> 	kunmap_atomic(kaddr, KM_USER0);
> 	return 0;
> short_pkt:
>+	/*
>+	 * When we get a short packet there are 2 possibilities. We can
>+	 * return an error, or fix up the response to look like a valid
>+	 * response and return what we have so far. If there are no
>+	 * entries and the packet was short, then return -EIO. If there
>+	 * are valid entries in the response, return them and pretend that
>+	 * the call was successful, but incomplete. The caller can retry the
>+	 * readdir starting at the last cookie.
>+	 */
> 	dprintk("%s: short packet at entry %d\n", __FUNCTION__, nr);
> 	entry[0] = entry[1] = 0;
>-	/* truncate listing ? */
>-	if (!nr) {
>-		printk(KERN_NOTICE "NFS: readdir reply truncated!\n");
>-		entry[1] = 1;
>-	}
>-	goto out;
>+	if (nr)
>+		goto out;
> err_unmap:
> 	kunmap_atomic(kaddr, KM_USER0);
> 	return -errno_NFSERR_IO;

Actions: View | Diff

Attachments on bug 428720: 294274 | 303350 | 303352 | 303353