summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 16:57:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 16:57:23 -0700
commit92b4e113155f9c8de9ef71ecdf55d796b68e7318 (patch)
tree11da79f48ac33463e5d4bccb0581728f6b53b1b2 /arch
parent8ee7a330fbb78344802cc6c3cc8be023b6d05aa0 (diff)
parent368b69a5b010cb00fc9ea04d588cff69af1a1359 (diff)
downloadlinux-92b4e113155f9c8de9ef71ecdf55d796b68e7318.tar.gz
linux-92b4e113155f9c8de9ef71ecdf55d796b68e7318.tar.bz2
linux-92b4e113155f9c8de9ef71ecdf55d796b68e7318.zip
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
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/vdso/vdso32-setup.c3
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);