Subject: [merged] x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch removed from -mm tree
To: luto@xxxxxxxxxxxxxx,hpa@xxxxxxxxxxxxxxx,mingo@xxxxxxx,sasha.levin@xxxxxxxxxx,stable@xxxxxxxxxxxxxxx,stefani@xxxxxxxxxxx,tglx@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 27 May 2014 13:22:33 -0700
The patch titled
Subject: x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet
has been removed from the -mm tree. Its filename was
x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Subject: x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet
The oops can be triggered in qemu using -no-hpet (but not nohpet) by
reading a couple of pages past the end of the vdso text. This should send
SIGBUS instead of OOPSing.
The bug was introduced by:
commit 7a59ed415f5b57469e22e41fc4188d5399e0b194
Author: Stefani Seibold <stefani@xxxxxxxxxxx>
Date: Mon Mar 17 23:22:09 2014 +0100
x86, vdso: Add 32 bit VDSO time support for 32 bit kernel
which is new in 3.15.
This will be fixed separately in 3.15, but that patch will not apply to
tip/x86/vdso. This is the equivalent fix for tip/x86/vdso and,
presumably, 3.16.
Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Reported-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Stefani Seibold <stefani@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [needs rework for 3.15 and earlier]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/vdso/vma.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/x86/vdso/vma.c~x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet arch/x86/vdso/vma.c
--- a/arch/x86/vdso/vma.c~x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet
+++ a/arch/x86/vdso/vma.c
@@ -90,6 +90,7 @@ static int map_vdso(const struct vdso_im
struct vm_area_struct *vma;
unsigned long addr;
int ret = 0;
+ static struct page *no_pages[] = {NULL};
if (calculate_addr) {
addr = vdso_addr(current->mm->start_stack,
@@ -125,7 +126,7 @@ static int map_vdso(const struct vdso_im
addr + image->size,
image->sym_end_mapping - image->size,
VM_READ,
- NULL);
+ no_pages);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);
_
Patches currently in -mm which might be from luto@xxxxxxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html