Linux 2.6.32.20
Subsystems (5)
I'm announcing the release of the 2.6.32.20 kernel.
All users of the 2.6.32 kernel series must upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.32.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 +- fs/proc/task_mmu.c | 8 +++++++- mm/memory.c | 13 ++++++------- mm/mlock.c | 8 ++++++++ 4 files changed, 22 insertions(+), 9 deletions(-)
Greg Kroah-Hartman (1):
Linux 2.6.32.20
Linus Torvalds (2):
mm: fix page table unmap for stack guard page properly
mm: fix up some user-visible effects of the stack guard page
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .19 +EXTRAVERSION = .20 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
fs/proc/task_mmu.c +7 -1
@@ -206,6 +206,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)int flags = vma->vm_flags;unsigned long ino =0 ;unsigned long long pgoff =0 ; +unsigned long start;dev_t dev =0 ;int len;
@@ -216,8 +217,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) pgoff = ((loff_t )vma->vm_pgoff) <<PAGE_SHIFT ; } +/* We don't show the stack guard page in /proc/maps */ + start = vma->vm_start; +if (vma->vm_flags &VM_GROWSDOWN ) + start +=PAGE_SIZE ; + seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", - vma->vm_start, + start, vma->vm_end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-',
mm/memory.c +6 -7
@@ -2662,24 +2662,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,spinlock_t *ptl;pte_t entry; -if (check_stack_guard_page (vma, address) <0 ) { -pte_unmap (page_table); +pte_unmap (page_table); + +/* Check if we need to add a guard page to the stack */ +if (check_stack_guard_page (vma, address) <0 )return VM_FAULT_SIGBUS ; - } +/* Use the zero-page for reads */ if (!(flags &FAULT_FLAG_WRITE )) { entry =pte_mkspecial (pfn_pte (my_zero_pfn (address), vma->vm_page_prot)); - ptl =pte_lockptr (mm, pmd); -spin_lock (ptl); + page_table =pte_offset_map_lock (mm, pmd, address, &ptl);if (!pte_none (*page_table)) goto unlock; goto setpte; }/* Allocate our own private page. */ -pte_unmap (page_table); -if (unlikely (anon_vma_prepare (vma))) goto oom; page =alloc_zeroed_user_highpage_movable (vma, address);
mm/mlock.c +8 -0
@@ -170,6 +170,14 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,if (vma->vm_flags &VM_WRITE ) gup_flags |=FOLL_WRITE ; +/* We don't try to access the guard page of a stack vma */ +if (vma->vm_flags &VM_GROWSDOWN ) { +if (start == vma->vm_start) { + start +=PAGE_SIZE ; + nr_pages--; + } + } +while (nr_pages >0 ) {int i;