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

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index e1f220e3ca68..310c5f0dbef1 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -155,6 +155,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         unsigned long addr;
         int ret = 0;
         struct vm_area_struct *vma;
+        static struct page *no_pages[] = {NULL};
 
 #ifdef CONFIG_X86_X32_ABI
         if (test_thread_flag(TIF_X32))
@@ -193,7 +194,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
                         addr -  VDSO_OFFSET(VDSO_PREV_PAGES),
                         VDSO_OFFSET(VDSO_PREV_PAGES),
                         VM_READ,
-                        NULL);
+                        no_pages);
 
         if (IS_ERR(vma)) {
                 ret = PTR_ERR(vma);