Attachment 680079 Details for Bug 869942 – Patch to fix NFS4 ACL reading for kernel 2.6.32-279.19.1

[patch] Patch to fix NFS4 ACL reading for kernel 2.6.32-279.19.1

kernel-2.6.32-279.19_fs_nfs_nfs4proc.c.patch (text/plain), 1.49 KB, created by Albert Flügel on 2013-01-17 08:54:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Albert Flügel

Created: 2013-01-17 08:54:30 UTC

Size: 1.49 KB

patch

obsolete

>--- fs/nfs/nfs4proc.c.org	2013-01-16 14:58:08.000000000 +0100
>+++ fs/nfs/nfs4proc.c	2013-01-17 09:39:49.000000000 +0100
>@@ -3445,7 +3445,7 @@
>  */
> static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
> {
>-	struct page *pages[NFS4ACL_MAXPAGES] = {NULL, };
>+	struct page *pages[NFS4ACL_MAXPAGES + 1] = {NULL, };
> 	struct nfs_getaclargs args = {
> 		.fh = NFS_FH(inode),
> 		.acl_pages = pages,
>@@ -3466,10 +3466,10 @@
> 	 * let's be prepared for a page of acl data. */
> 	if (npages == 0)
> 		npages = 1;
>-	if (npages > ARRAY_SIZE(pages))
>+	if (npages + 1 > ARRAY_SIZE(pages))
> 		return -ERANGE;
> 
>-	for (i = 0; i < npages; i++) {
>+	for (i = 0; i <= npages; i++) {
> 		pages[i] = alloc_page(GFP_KERNEL);
> 		if (!pages[i])
> 			goto out_free;
>@@ -3480,7 +3480,7 @@
> 	if (!res.acl_scratch)
> 		goto out_free;
> 
>-	args.acl_len = npages * PAGE_SIZE;
>+	args.acl_len = (npages + 1) * PAGE_SIZE;
> 	args.acl_pgbase = 0;
> 
> 	dprintk("%s  buf %p buflen %zu npages %d args.acl_len %zu\n",
>@@ -3498,12 +3498,19 @@
> 		goto out_free;
> 	}
> 	nfs4_write_cached_acl(inode, pages, res.acl_data_offset, res.acl_len);
>-	if (buf)
>+	if (buf) {
>+		ret = -ERANGE;
>+		if (res.acl_len > buflen) {
>+			_copy_from_pages(buf, pages, res.acl_data_offset, buflen);
>+			goto out_free;
>+		}
>+		
> 		_copy_from_pages(buf, pages, res.acl_data_offset, res.acl_len);
>+	}
> out_ok:
> 	ret = res.acl_len;
> out_free:
>-	for (i = 0; i < npages; i++)
>+	for (i = 0; i <= npages; i++)
> 		if (pages[i])
> 			__free_page(pages[i]);
> 	if (res.acl_scratch)

Actions: View | Diff

Attachments on bug 869942: 633216 | 633217 | 633405 | 634959 | 680079