Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 92b4e113155f9c8de9ef71ecdf55d796b68e7318

Authored by Linus Torvalds
2 parents 8ee7a330fb 368b69a5b0
Exists in ti-lsk-linux-4.1.y and in 12 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y

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

Showing 1 changed file Side-by-side Diff

arch/x86/vdso/vdso32-setup.c
Diff comments   View file @ 92b4e11
... ... @@ -155,6 +155,7 @@
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))
... ... @@ -193,7 +194,7 @@
193 194 addr - VDSO_OFFSET(VDSO_PREV_PAGES),
194 195 VDSO_OFFSET(VDSO_PREV_PAGES),
195 196 VM_READ,
196   - NULL);
  197 + no_pages);
197 198  
198 199 if (IS_ERR(vma)) {
199 200 ret = PTR_ERR(vma);