Attachment 77012 Details for Bug 149905

[patch] Proposed patch

nfs-directio-limit (text/plain), 1.20 KB, created by Olaf Kirch on 2006-04-06 19:48:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Kirch

Created: 2006-04-06 19:48:15 UTC

Size: 1.20 KB

patch

obsolete

> fs/nfs/direct.c |   13 ++++++-------
> 1 files changed, 6 insertions(+), 7 deletions(-)
>
>Index: build/fs/nfs/direct.c
>===================================================================
>--- build.orig/fs/nfs/direct.c
>+++ build/fs/nfs/direct.c
>@@ -55,7 +55,7 @@
> #include <asm/atomic.h>
> 
> #define NFSDBG_FACILITY		NFSDBG_VFS
>-#define MAX_DIRECTIO_SIZE	(4096UL << PAGE_SHIFT)
>+#define MAX_DIRECTIO_PAGES	(1 << 24)
> 
> static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty);
> static kmem_cache_t *nfs_direct_cachep;
>@@ -90,16 +90,15 @@ nfs_get_user_pages(int rw, unsigned long
> 	unsigned long page_count;
> 	size_t array_size;
> 
>+	page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;
>+	page_count -= user_addr >> PAGE_SHIFT;
>+
> 	/* set an arbitrary limit to prevent type overflow */
>-	/* XXX: this can probably be as large as INT_MAX */
>-	if (size > MAX_DIRECTIO_SIZE) {
>+	if (page_count >= MAX_DIRECTIO_PAGES) {
> 		*pages = NULL;
>-		return -EFBIG;
>+		return -EINVAL;
> 	}
> 
>-	page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;
>-	page_count -= user_addr >> PAGE_SHIFT;
>-
> 	array_size = (page_count * sizeof(struct page *));
> 	*pages = kmalloc(array_size, GFP_KERNEL);
> 	if (*pages) {

Actions: View | Diff

Attachments on bug 149905: 67550 | 75786 | 77012 | 77743