Attachment 313666 Details for Bug 426081 – Upstream patch for this issue

[patch] Upstream patch for this issue

0001-tmpfs-restore-missing-clear_highpage.patch (text/plain), 1.50 KB, created by Eugene Teo (Security Response) on 2008-08-07 05:27:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Teo (Security Response)

Created: 2008-08-07 05:27:39 UTC

Size: 1.50 KB

patch

obsolete

>From e84e2e132c9c66d8498e7710d4ea532d1feaaac5 Mon Sep 17 00:00:00 2001
>From: Hugh Dickins <hugh@veritas.com>
>Date: Wed, 28 Nov 2007 18:55:10 +0000
>Subject: [PATCH] tmpfs: restore missing clear_highpage
>
>tmpfs was misconverted to __GFP_ZERO in 2.6.11.  There's an unusual case in
>which shmem_getpage receives the page from its caller instead of allocating.
>We must cover this case by clear_highpage before SetPageUptodate, as before.
>
>Signed-off-by: Hugh Dickins <hugh@veritas.com>
>Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>---
> mm/shmem.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/mm/shmem.c b/mm/shmem.c
>index 253d205..51b3d6c 100644
>--- a/mm/shmem.c
>+++ b/mm/shmem.c
>@@ -1072,7 +1072,7 @@ shmem_alloc_page(gfp_t gfp, struct shmem_inode_info *info,
> 	pvma.vm_policy = mpol_shared_policy_lookup(&info->policy, idx);
> 	pvma.vm_pgoff = idx;
> 	pvma.vm_end = PAGE_SIZE;
>-	page = alloc_page_vma(gfp | __GFP_ZERO, &pvma, 0);
>+	page = alloc_page_vma(gfp, &pvma, 0);
> 	mpol_free(pvma.vm_policy);
> 	return page;
> }
>@@ -1093,7 +1093,7 @@ shmem_swapin(struct shmem_inode_info *info,swp_entry_t entry,unsigned long idx)
> static inline struct page *
> shmem_alloc_page(gfp_t gfp,struct shmem_inode_info *info, unsigned long idx)
> {
>-	return alloc_page(gfp | __GFP_ZERO);
>+	return alloc_page(gfp);
> }
> #endif
> 
>@@ -1306,6 +1306,7 @@ repeat:
> 
> 		info->alloced++;
> 		spin_unlock(&info->lock);
>+		clear_highpage(filepage);
> 		flush_dcache_page(filepage);
> 		SetPageUptodate(filepage);
> 	}
>-- 
>1.5.5.1
>

Actions: View | Diff

Attachments on bug 426081: 313666