From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Chuck Lever <chuck.lever@oracle.com>,
Trond Myklebust <Trond.Myklebust@netapp.com>
Subject: [patch 17/29] NFS: NFSv4 readdir loses entries
Date: Thu, 10 Mar 2011 15:54:23 -0800 [thread overview]
Message-ID: <20110310235537.724922731@clark.kroah.org> (raw)
In-Reply-To: <20110310235548.GA10103@kroah.com>
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
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:
next prev parent reply other threads:[~2011-03-11 0:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 23:55 [patch 00/29] 2.6.37.4-stable review Greg KH
2011-03-10 23:54 ` [patch 01/29] cpuset: add a missing unlock in cpuset_write_resmask() Greg KH
2011-03-10 23:54 ` [patch 02/29] virtio: console: Dont access vqs if device was unplugged Greg KH
2011-03-10 23:54 ` [patch 03/29] [S390] keyboard: integer underflow bug Greg KH
2011-03-10 23:54 ` [patch 04/29] ASoC: Fix WM9081 platform data initialisation Greg KH
2011-03-10 23:54 ` [patch 05/29] ALSA: HDA: Realtek: Fixup jack detection to input subsystem Greg KH
2011-03-10 23:54 ` [patch 06/29] ALSA: hda - Dont set to D3 in Cirrus errata init verbs Greg KH
2011-03-10 23:54 ` [patch 07/29] drivers/misc/bmp085.c: add MODULE_DEVICE_TABLE Greg KH
2011-03-10 23:54 ` [patch 08/29] nfs4: Ensure that ACL pages sent over NFS were not allocated from the slab (v3) Greg KH
2011-03-10 23:54 ` [patch 09/29] RxRPC: Fix v1 keys Greg KH
2011-03-10 23:54 ` [patch 10/29] ath9k: Fix ath9k prevents CPU to enter C3 states Greg KH
2011-03-10 23:54 ` [patch 11/29] ixgbe: fix for 82599 erratum on Header Splitting Greg KH
2011-03-10 23:54 ` [patch 12/29] mm: fix possible cause of a page_mapped BUG Greg KH
2011-03-10 23:54 ` [patch 13/29] netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values Greg KH
2011-03-10 23:54 ` [patch 14/29] [CPUFREQ] pcc-cpufreq: dont load driver if get_freq fails during init Greg KH
2011-03-10 23:54 ` [patch 15/29] nfsd: wrong index used in inner loop Greg KH
2011-03-10 23:54 ` [patch 16/29] HID: hid-mosart: ignore buttons report Greg KH
2011-03-10 23:54 ` Greg KH [this message]
2011-03-10 23:54 ` [patch 18/29] ipvs: fix dst_lock locking on dest update Greg KH
2011-03-10 23:54 ` [patch 19/29] net: dont allow CAP_NET_ADMIN to load non-netdev kernel modules Greg KH
2011-03-10 23:54 ` [patch 20/29] netfilter: arpt_mangle: fix return values of checkentry Greg KH
2011-03-10 23:54 ` [patch 21/29] r8169: use RxFIFO overflow workaround for 8168c chipset Greg KH
2011-03-10 23:54 ` [patch 22/29] r8169: RxFIFO overflow oddities with 8168 chipsets Greg KH
2011-03-10 23:54 ` [patch 23/29] r8169: prevent RxFIFO induced loops in the irq handler Greg KH
2011-03-10 23:54 ` [patch 24/29] drivers/net: Call netif_carrier_off at the end of the probe Greg KH
2011-03-10 23:54 ` [patch 25/29] sched: Fix sched rt group scheduling when hierachy is enabled Greg KH
2011-03-10 23:54 ` [patch 26/29] [media] ivtv: Fix corrective action taken upon DMA ERR interrupt to avoid hang Greg KH
2011-03-10 23:54 ` [patch 27/29] [media] cx23885: Revert "Check for slave nack on all transactions" Greg KH
2011-03-10 23:54 ` [patch 28/29] [media] cx25840: fix probing of cx2583x chips Greg KH
2011-03-10 23:54 ` [patch 29/29] [media] DiB7000M: add pid filtering Greg KH
2011-03-11 15:02 ` [patch 00/29] 2.6.37.4-stable review Stefan Lippers-Hollmann
2011-03-11 15:46 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110310235537.724922731@clark.kroah.org \
--to=gregkh@suse.de \
--cc=Trond.Myklebust@netapp.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuck.lever@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®