From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 10 Mar 2011 21:14:28 +0000 (-0800)
Subject: .37 patches
X-Git-Tag: v2.6.37.4~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5296ad6de963a687c5b36f0fc5bce6daf2a98c6;p=thirdparty%2Fkernel%2Fstable-queue.git

.37 patches
---

diff --git a/queue-2.6.37/nfs-nfsv4-readdir-loses-entries.patch b/queue-2.6.37/nfs-nfsv4-readdir-loses-entries.patch
new file mode 100644
index 00000000000..645b2de0c72
--- /dev/null
+++ b/queue-2.6.37/nfs-nfsv4-readdir-loses-entries.patch
@@ -0,0 +1,56 @@
+From d1205f87bbb8040c1408bbd9e0a720310b2b0b9b Mon Sep 17 00:00:00 2001
+From: Chuck Lever <chuck.lever@oracle.com>
+Date: Fri, 28 Jan 2011 12:41:05 -0500
+Subject: NFS: NFSv4 readdir loses entries
+
+From: Chuck Lever <chuck.lever@oracle.com>
+
+commit d1205f87bbb8040c1408bbd9e0a720310b2b0b9b upstream.
+
+On recent 2.6.38-rc kernels, connectathon basic test 6 fails on
+NFSv4 mounts of OpenSolaris with something like:
+
+> ./test6: readdir
+> 	./test6: (/mnt/klimt/matisse.test) didn't read expected 'file.12' dir entry, pass 0
+> 	./test6: (/mnt/klimt/matisse.test) didn't read expected 'file.82' dir entry, pass 0
+> 	./test6: (/mnt/klimt/matisse.test) didn't read expected 'file.164' dir entry, pass 0
+> 	./test6: (/mnt/klimt/matisse.test) Test failed with 3 errors
+> basic tests failed
+> Tests failed, leaving /mnt/klimt mounted
+> [cel@matisse cthon04]$
+
+I narrowed the problem down to nfs4_decode_dirent() reporting that the
+decode buffer had overflowed while decoding the entries for those
+missing files.
+
+verify_attr_len() assumes both it's pointer arguments reside on the
+same page.  When these arguments point to locations on two different
+pages, verify_attr_len() can report false errors.  This can happen now
+that a large NFSv4 readdir result can span pages.
+
+We have reasonably good checking in nfs4_decode_dirent() anyway, so
+it should be safe to simply remove the extra checking.
+
+At a guess, this was introduced by commit 6650239a, "NFS: Don't use
+vm_map_ram() in readdir".
+
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/nfs/nfs4xdr.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/fs/nfs/nfs4xdr.c
++++ b/fs/nfs/nfs4xdr.c
+@@ -6212,9 +6212,6 @@ __be32 *nfs4_decode_dirent(struct xdr_st
+ 	if (entry->fattr->valid & NFS_ATTR_FATTR_TYPE)
+ 		entry->d_type = nfs_umode_to_dtype(entry->fattr->mode);
+ 
+-	if (verify_attr_len(xdr, p, len) < 0)
+-		goto out_overflow;
+-
+ 	return p;
+ 
+ out_overflow:
diff --git a/queue-2.6.37/series b/queue-2.6.37/series
index ba54220f4fe..8bdeaf0543b 100644
--- a/queue-2.6.37/series
+++ b/queue-2.6.37/series
@@ -14,3 +14,4 @@ netfilter-nf_log-avoid-oops-in-un-bind-with-invalid-nfproto-values.patch
 pcc-cpufreq-don-t-load-driver-if-get_freq-fails-during-init.patch
 nfsd-wrong-index-used-in-inner-loop.patch
 hid-hid-mosart-ignore-buttons-report.patch
+nfs-nfsv4-readdir-loses-entries.patch