This is a note to let you know that I've just added the patch titled
NFS: Fix a decoding problem in nfs3_decode_dirent
to the 2.6.37-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfs-fix-a-decoding-problem-in-nfs3_decode_dirent.patch
and it can be found in the queue-2.6.37 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Fri Mar 18 14:52:55 2011
From: Trond Myklebust <[email protected]>
Date: Thu, 17 Mar 2011 21:54:39 -0400
Subject: NFS: Fix a decoding problem in nfs3_decode_dirent
To: [email protected]
Cc: Trond Myklebust <[email protected]>
Message-ID: <[email protected]>
[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 <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
Reviewed-by: NeilBrown <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
fs/nfs/nfs2xdr.c | 6 ++++--
fs/nfs/nfs3xdr.c | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -477,11 +477,13 @@ nfs_decode_dirent(struct xdr_stream *xdr
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++);
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -614,11 +614,13 @@ nfs3_decode_dirent(struct xdr_stream *xd
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);
Patches currently in stable-queue which might be from
[email protected] are
queue-2.6.37/nfs-fix-a-decoding-problem-in-nfs3_decode_dirent.patch
queue-2.6.37/rpc-killing-rpc-tasks-races-fixed.patch
queue-2.6.37/nfs-fix-compilation-warning.patch
queue-2.6.37/sunrpc-ensure-we-always-run-the-tk_callback-before-tk_action.patch
queue-2.6.37/nfs-nfsroot-should-default-to-proto-udp.patch
queue-2.6.37/sunrpc-propagate-errors-from-xs_bind-through-xs_create_sock.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
