]> git.karo-electronics.de Git - karo-tx-linux.git/commit
x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet
authorAndy Lutomirski <luto@amacapital.net>
Sat, 17 May 2014 13:19:24 +0000 (23:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 07:35:00 +0000 (17:35 +1000)
commit474f34a9f094929642d70b1b43520db8324f809f
tree675ab0fb6a878057356ff3890db916dab02d0aa2
parent5f0202bc5e034d4801511dd568de7d8ccbb7a00b
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@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.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Stefani Seibold <stefani@seibold.net>
Cc: <stable@vger.kernel.org> [needs rework for 3.15 and earlier]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/x86/vdso/vma.c