diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-17 21:54:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-23 12:50:22 -0700 |
| commit | 2ea86e74bb34b67226254b99f7071af69228ec95 (patch) | |
| tree | b56e2bc51ef03f7f1c0f1045bce3a1026aa61fc6 | |
| parent | 076620dbeb0b3993144f4e73e16b966e7a26370f (diff) | |
NFS: Fix a decoding problem in nfs3_decode_dirent
[This needs to be applied to 2.6.37 only. The bug in question was
inadvertently fixed by a series of cleanups in 2.6.38, but the patches
in question are too large to be backported. This patch is a minimal fix
that serves the same purpose.]
When we decode a filename followed by an 8-byte cookie, we need to
consider the fact that the filename and cookie are 32-bit word aligned.
Presently, we may end up copying insufficient amounts of data when
xdr_inline_decode() needs to invoke xdr_copy_to_scratch to deal
with a page boundary.
The following patch fixes the issue by first decoding the filename, and
then decoding the cookie.
Reported-by: Neil Brown <neilb@suse.de>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/nfs/nfs2xdr.c | 6 | ||||
| -rw-r--r-- | fs/nfs/nfs3xdr.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index b382a1b5e7e4..33a038d17992 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c @@ -477,11 +477,13 @@ nfs_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, struct nfs_se entry->ino = ntohl(*p++); entry->len = ntohl(*p++); - p = xdr_inline_decode(xdr, entry->len + 4); + p = xdr_inline_decode(xdr, entry->len); if (unlikely(!p)) goto out_overflow; entry->name = (const char *) p; - p += XDR_QUADLEN(entry->len); + p = xdr_inline_decode(xdr, 4); + if (unlikely(!p)) + goto out_overflow; entry->prev_cookie = entry->cookie; entry->cookie = ntohl(*p++); diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index ba91236c6ee7..dcd934ffda0b 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -614,11 +614,13 @@ nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, struct nfs_s p = xdr_decode_hyper(p, &entry->ino); entry->len = ntohl(*p++); - p = xdr_inline_decode(xdr, entry->len + 8); + p = xdr_inline_decode(xdr, entry->len); if (unlikely(!p)) goto out_overflow; entry->name = (const char *) p; - p += XDR_QUADLEN(entry->len); + p = xdr_inline_decode(xdr, 8); + if (unlikely(!p)) + goto out_overflow; entry->prev_cookie = entry->cookie; p = xdr_decode_hyper(p, &entry->cookie); |