ramfs/nommu: fix bug - kernel crash when (nr != lpages)
PATCH 1/1 ramfs/nommu: fix bug - kernel crash when (nr != lpages)
From: Graf Yang <[email protected]>
Avoiding kernel crash when (nr != lpages), and return -ENOMEM, let the user space application handle this error.
--- fs/ramfs/file-nommu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
fs/ramfs/file-nommu.c +2 -1
@@ -283,7 +283,8 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file,if (pages) { ptr = pages;for (loop = lpages; loop >0 ; loop--) -put_page (*ptr++); +if (*ptr) +put_page (*ptr++);kfree (pages); }
Signature · 1 line
1.5.6
Quoted 2 lines · Bryan Wu
Avoiding kernel crash when (nr != lpages), and return
-ENOMEM, let the user space application handle this error.
A better patch is attached.
David
---
From: David Howells <[email protected]>
Subject: [PATCH] NOMMU: Fix cleanup handling in ramfs_nommu_get_umapped_area()
Fix cleanup handling in ramfs_nommu_get_umapped_area() by only freeing the number of pages that find_get_pages() said it had returned (nr) rather than attempting to free the number of pages we asked for (lpages) - thus avoiding the situation whereby put_page() may be handed NULL pointers if find_get_pages() returned fewer pages that were requested.
Also avoid a warning about nr being uninitialised and the need for an if-statement in the cleanup path by using appropriate gotos.
---
fs/ramfs/file-nommu.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-)
fs/ramfs/file-nommu.c +10 -11
@@ -262,11 +262,11 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file, ret = -ENOMEM ; pages =kzalloc (lpages *sizeof (struct page *),GFP_KERNEL );if (!pages) - goto out; + goto out_free; nr =find_get_pages (inode->i_mapping, pgoff, lpages, pages);if (nr != lpages) - goto out;/* leave if some pages were missing */ + goto out_free_pages;/* leave if some pages were missing */ /* check the pages for physical adjacency */ ptr = pages;
@@ -274,19 +274,18 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file, page++;for (loop = lpages; loop >1 ; loop--)if (*ptr++ != page++) - goto out; + goto out_free_pages;/* okay - all conditions fulfilled */ ret = (unsigned long )page_address (pages[0 ]); - out: -if (pages) { - ptr = pages; -for (loop = lpages; loop >0 ; loop--) -put_page (*ptr++); -kfree (pages); - } - +out_free_pages: + ptr = pages; +for (loop = nr; loop >0 ; loop--) +put_page (*ptr++); +out_free: +kfree (pages); +out:return ret; }