Commit 12441ccd authored by Randy Dunlap's avatar Randy Dunlap Committed by Borislav Petkov

x86: Fix return value of __setup handlers

__setup() handlers should return 1 to obsolete_checksetup() in
init/main.c to indicate that the boot option has been handled. A return
of 0 causes the boot option/value to be listed as an Unknown kernel
parameter and added to init's (limited) argument (no '=') or environment
(with '=') strings. So return 1 from these x86 __setup handlers.

Examples:

  Unknown kernel command line parameters "apicpmtimer
    BOOT_IMAGE=/boot/bzImage-517rc8 vdso=1 ring3mwait=disable", will be
    passed to user space.

  Run /sbin/init as init process
   with arguments:
     /sbin/init
     apicpmtimer
   with environment:
     HOME=/
     TERM=linux
     BOOT_IMAGE=/boot/bzImage-517rc8
     vdso=1
     ring3mwait=disable

Fixes: 2aae950b ("x86_64: Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu")
Fixes: 77b52b4c ("x86: add "debugpat" boot option")
Fixes: e16fd002 ("x86/cpufeature: Enable RING3MWAIT for Knights Landing")
Fixes: b8ce3359 ("x86_64: convert to clock events")
Reported-by: default avatarIgor Zhbanov <i.zhbanov@omprussia.ru>
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
Link: https://lore.kernel.org/r/20220314012725.26661-1-rdunlap@infradead.org
parent b86eb740
...@@ -438,7 +438,7 @@ bool arch_syscall_is_vdso_sigreturn(struct pt_regs *regs) ...@@ -438,7 +438,7 @@ bool arch_syscall_is_vdso_sigreturn(struct pt_regs *regs)
static __init int vdso_setup(char *s) static __init int vdso_setup(char *s)
{ {
vdso64_enabled = simple_strtoul(s, NULL, 0); vdso64_enabled = simple_strtoul(s, NULL, 0);
return 0; return 1;
} }
__setup("vdso=", vdso_setup); __setup("vdso=", vdso_setup);
......
...@@ -170,7 +170,7 @@ static __init int setup_apicpmtimer(char *s) ...@@ -170,7 +170,7 @@ static __init int setup_apicpmtimer(char *s)
{ {
apic_calibrate_pmtmr = 1; apic_calibrate_pmtmr = 1;
notsc_setup(NULL); notsc_setup(NULL);
return 0; return 1;
} }
__setup("apicpmtimer", setup_apicpmtimer); __setup("apicpmtimer", setup_apicpmtimer);
#endif #endif
......
...@@ -91,7 +91,7 @@ static bool ring3mwait_disabled __read_mostly; ...@@ -91,7 +91,7 @@ static bool ring3mwait_disabled __read_mostly;
static int __init ring3mwait_disable(char *__unused) static int __init ring3mwait_disable(char *__unused)
{ {
ring3mwait_disabled = true; ring3mwait_disabled = true;
return 0; return 1;
} }
__setup("ring3mwait=disable", ring3mwait_disable); __setup("ring3mwait=disable", ring3mwait_disable);
......
...@@ -101,7 +101,7 @@ int pat_debug_enable; ...@@ -101,7 +101,7 @@ int pat_debug_enable;
static int __init pat_debug_setup(char *str) static int __init pat_debug_setup(char *str)
{ {
pat_debug_enable = 1; pat_debug_enable = 1;
return 0; return 1;
} }
__setup("debugpat", pat_debug_setup); __setup("debugpat", pat_debug_setup);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment