On Fri, 2012-08-24 at 15:07 +0000, Myklebust, Trond wrote:
> On Fri, 2012-08-24 at 15:16 +0100, Sachin Prabhu wrote:
> > This fixes a bug introduced by commit
> > 5a00689930ab975fdd1b37b034475017e460cf2a
> > The patch adds an extra page to npages to hold the bitmap returned by
> > the server.
> >
> > Bruce Fields pointed out that the changes introduced by the patch will
> > cause the array npages to overflow if a buffer of size greater than or
> > equal to XATTR_SIZE_MAX is passed to __nfs4_get_acl_uncached()
>
> I'd think that the right thing to do here is rather to add appropriate
> buffer overflow checks. How about something like the following?
>
> 8<--------------------------------------------------------------
> From 7c35ce220924182284aea9f8aec39b0d991600df Mon Sep 17 00:00:00 2001
> From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
> Date: Fri, 24 Aug 2012 10:59:25 -0400
> Subject: [PATCH] NFSv4: Fix range checking in __nfs4_get_acl_uncached and
> __nfs4_proc_set_acl
>
> Ensure that the user supplied buffer size doesn't cause us to overflow
> the 'pages' array.
>
> Also fix up some confusion between the use of PAGE_SIZE and
> PAGE_CACHE_SIZE when calculating buffer sizes. We're not using
> the page cache for anything here.
>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
This patch is susceptible to the problem described in commit
5a00689930ab975fdd1b37b034475017e460cf2a
This can be demonstrated by the following patch to pynfs which pads the
bitmap with 1000 extra elements.
To reproduce, on the server
cd newpynfs/nfs4.0/
./setup.py build_ext --inplace
./nfs4server.py
on the client,
mount -o vers=4 SERVER:/ /mnt
touch /mnt/a
nfs4_getfacl /mnt/a
With this new patch, you will get a general protection fault in
_copy_from_pages().
>From 1ca7fbab80ded2fc79c668786ba22d585a988ab5 Mon Sep 17 00:00:00 2001
From: Sachin Prabhu <sprabhu@xxxxxxxxxx>
Date: Fri, 24 Aug 2012 22:16:16 +0100
Subject: [PATCH] Demonstrate unbounded bitmap problem for nfs4 getacl
---
nfs4.0/lib/nfs4/nfs4lib.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/nfs4.0/lib/nfs4/nfs4lib.py b/nfs4.0/lib/nfs4/nfs4lib.py
index 0a38ebc..940ae86 100644
--- a/nfs4.0/lib/nfs4/nfs4lib.py
+++ b/nfs4.0/lib/nfs4/nfs4lib.py
@@ -87,9 +87,17 @@ class FancyNFS4Packer(nfs4_pack.NFS4Packer):
"""Handle fattr4 and dirlist4 more cleanly than auto-generated methods"""
def filter_bitmap4(self, data):
out = []
+ flag = 0;
while data:
+ flag = 1;
out.append(data & 0xffffffffL)
data >>= 32
+ if (flag and out[0] == 4096) :
+ print "add test data";
+ i = 1000
+ while i:
+ out.append(0)
+ i -= 1
return out
def filter_fattr4(self, data):
--
1.7.11.4
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
