github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

x86/um/vdso: Panic when vDSO can not be allocated

Browse Source 
The vDSO address is added to the userspace auxiliary vectors even if the
vDSO was not allocated. When accessing the page, userspace processes
will crash.

Enforce that the allocation works.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20251013-uml-vdso-cleanup-v1-3-a079c7adcc69@weissschuh.net
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Thomas Weißschuh 2025-10-13 12:40:20 +02:00 committed by Johannes Berg
parent 8c0fbd6ae4
commit 12fe820fae
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/um/vdso/vma.c
View File

@ -10,7 +10,6 @@
#include <asm/elf.h>
#include <linux/init.h>
static unsigned int __read_mostly vdso_enabled = 1;
unsigned long um_vdso_addr;
static struct page *um_vdso;
@ -25,17 +24,11 @@ static int __init init_vdso(void)
um_vdso = alloc_page(GFP_KERNEL);
if (!um_vdso)
goto oom;
panic("Cannot allocate vdso\n");
copy_page(page_address(um_vdso), vdso_start);
return 0;
oom:
printk(KERN_ERR "Cannot allocate vdso\n");
vdso_enabled = 0;
return -ENOMEM;
}
subsys_initcall(init_vdso);
@ -48,9 +41,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
.pages = &um_vdso,
};
if (!vdso_enabled)
return 0;
if (mmap_write_lock_killable(mm))
return -EINTR;