[kernel] r18922 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Apr  9 04:05:34 2012
New Revision: 18922

Log:
nfs: Fix length of buffer copied in __nfs4_get_acl_uncached

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/nfs-Fix-length-of-buffer-copied-in-__nfs4_get_acl_uncach.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Apr  9 00:47:41 2012	(r18921)
+++ dists/sid/linux-2.6/debian/changelog	Mon Apr  9 04:05:34 2012	(r18922)
@@ -9,6 +9,7 @@
   * TOMOYO: Fix mount flags checking order.
   * drm/radeon/kms: fix fans after resume (Closes: #596741)
   * [x86] hv: Update all Hyper-V drivers to 3.4-rc1 (Closes: #661318)
+  * nfs: Fix length of buffer copied in __nfs4_get_acl_uncached
 
   [ Jonathan Nieder ]
   * [x86] ioat: fix size of 'completion' for Xen (Closes: #660554)

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/nfs-Fix-length-of-buffer-copied-in-__nfs4_get_acl_uncach.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/nfs-Fix-length-of-buffer-copied-in-__nfs4_get_acl_uncach.patch	Mon Apr  9 04:05:34 2012	(r18922)
@@ -0,0 +1,33 @@
+From: Sachin Prabhu <sprabhu at redhat.com>
+Date: Thu, 22 Mar 2012 16:46:28 +0000
+Subject: [PATCH] Fix length of buffer copied in __nfs4_get_acl_uncached
+
+commit 20e0fa98b751facf9a1101edaefbc19c82616a68 upstream.
+
+_copy_from_pages() used to copy data from the temporary buffer to the
+user passed buffer is passed the wrong size parameter when copying
+data. res.acl_len contains both the bitmap and acl lenghts while
+acl_len contains the acl length after adjusting for the bitmap size.
+
+Signed-off-by: Sachin Prabhu <sprabhu at redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
+---
+ fs/nfs/nfs4proc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index e809d23..45df7d4 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -3712,7 +3712,7 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu
+ 		if (acl_len > buflen)
+ 			goto out_free;
+ 		_copy_from_pages(buf, pages, res.acl_data_offset,
+-				res.acl_len);
++				acl_len);
+ 	}
+ 	ret = acl_len;
+ out_free:
+-- 
+1.7.9.5
+

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Mon Apr  9 00:47:41 2012	(r18921)
+++ dists/sid/linux-2.6/debian/patches/series/base	Mon Apr  9 04:05:34 2012	(r18922)
@@ -177,3 +177,5 @@
 # Temporary, until the next ABI bump
 + debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
 + debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch
+
++ bugfix/all/nfs-Fix-length-of-buffer-copied-in-__nfs4_get_acl_uncach.patch