33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 20e0fa98b751facf9a1101edaefbc19c82616a68 Mon Sep 17 00:00:00 2001
|
|
From: Sachin Prabhu <sprabhu@redhat.com>
|
|
Date: Thu, 22 Mar 2012 16:46:28 +0000
|
|
Subject: [PATCH] Fix length of buffer copied in __nfs4_get_acl_uncached
|
|
|
|
_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@redhat.com>
|
|
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
|
|
---
|
|
fs/nfs/nfs4proc.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
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.7.6
|
|
|