iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET

Browse Source 
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@seibold.net>
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.

Cc: Stefani Seibold <stefani@seibold.net>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/c8b0a9a0b8d011a8b273cbb2de88d37190ed2751.1400538962.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Andy Lutomirski 2014-05-19 15:58:31 -07:00 committed by H. Peter Anvin
parent 2b6f2e649f
commit 1e844fb43c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/vdso/vma.c
View File

@ -90,6 +90,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
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_image *image, bool calculate_addr)
addr + image->size,
image->sym_end_mapping - image->size,
VM_READ,
NULL);
no_pages);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);