From 74d438872dae44abfcfffad4daccd7f22cdf7bad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Tue, 28 Oct 2025 10:15:36 +0100 Subject: [PATCH] um: Split out default elf_aux_platform MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Setting all auxiliary vector values to default values if one of them was not provided by the host will discard perfectly fine values. Move the elf_aux_platform fallback to its own conditional. Signed-off-by: Thomas Weißschuh Link: https://patch.msgid.link/20251028-uml-remove-32bit-pseudo-vdso-v1-1-e930063eff5f@weissschuh.net Signed-off-by: Johannes Berg --- arch/um/os-Linux/elf_aux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index 0a0f91cf4d6d5..a62fe39e85c90 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -62,14 +62,16 @@ __init void scan_elf_aux( char **envp) } } if ( ! __kernel_vsyscall || ! vsyscall_ehdr || - ! elf_aux_hwcap || ! elf_aux_platform || + ! elf_aux_hwcap || ! page_size || (vsyscall_ehdr % page_size) ) { __kernel_vsyscall = 0; vsyscall_ehdr = 0; elf_aux_hwcap = 0; - elf_aux_platform = "i586"; } else { vsyscall_end = vsyscall_ehdr + page_size; } + + if (!elf_aux_platform) + elf_aux_platform = "i586"; } -- 2.47.3