Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Peter Anvin:
"A single quite small patch that managed to get overlooked earlier, to
prevent a user space triggerable oops on systems without HPET"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET
+2
-1
+2
-1
arch/x86/vdso/vdso32-setup.c
+2
-1
arch/x86/vdso/vdso32-setup.c
···
155
155
unsigned long addr;
156
156
int ret = 0;
157
157
struct vm_area_struct *vma;
158
+
static struct page *no_pages[] = {NULL};
158
159
159
160
#ifdef CONFIG_X86_X32_ABI
160
161
if (test_thread_flag(TIF_X32))
···
194
193
addr - VDSO_OFFSET(VDSO_PREV_PAGES),
195
194
VDSO_OFFSET(VDSO_PREV_PAGES),
196
195
VM_READ,
197
-
NULL);
196
+
no_pages);
198
197
199
198
if (IS_ERR(vma)) {
200
199
ret = PTR_ERR(vma);