2024-02-11 05:28:30

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH v5] sparc: vDSO: fix return value of __setup handler

__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 or environment
strings. Also, error return codes don't mean anything to
obsolete_checksetup() -- only non-zero (usually 1) or zero.
So return 1 from vdso_setup().

Fixes: 9a08862a5d2e ("vDSO for sparc")
Signed-off-by: Randy Dunlap <[email protected]>
Reported-by: Igor Zhbanov <[email protected]>
Link: lore.kernel.org/r/[email protected]
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
Cc: Dan Carpenter <[email protected]>
Cc: Nick Alcock <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: [email protected]
Cc: Arnd Bergmann <[email protected]>
Cc: Andreas Larsson <[email protected]>
---
v2: correct the Fixes: tag (Dan Carpenter)
v3: add more Cc's;
correct Igor's email address;
change From: Igor to Reported-by: Igor;
v4: add Arnd to Cc: list
v5: add Andreas to Cc: list

arch/sparc/vdso/vma.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff -- a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c
--- a/arch/sparc/vdso/vma.c
+++ b/arch/sparc/vdso/vma.c
@@ -449,9 +449,8 @@ static __init int vdso_setup(char *s)
unsigned long val;

err = kstrtoul(s, 10, &val);
- if (err)
- return err;
- vdso_enabled = val;
- return 0;
+ if (!err)
+ vdso_enabled = val;
+ return 1;
}
__setup("vdso=", vdso_setup);


2024-02-16 16:24:11

by Andreas Larsson

[permalink] [raw]
Subject: Re: [PATCH v5] sparc: vDSO: fix return value of __setup handler

On 2024-02-11 06:28, Randy Dunlap wrote:
> __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 or environment
> strings. Also, error return codes don't mean anything to
> obsolete_checksetup() -- only non-zero (usually 1) or zero.
> So return 1 from vdso_setup().
>
> Fixes: 9a08862a5d2e ("vDSO for sparc")
> Signed-off-by: Randy Dunlap <[email protected]>
> Reported-by: Igor Zhbanov <[email protected]>
> Link: lore.kernel.org/r/[email protected]
> Cc: "David S. Miller" <[email protected]>
> Cc: [email protected]
> Cc: Dan Carpenter <[email protected]>
> Cc: Nick Alcock <[email protected]>
> Cc: Sam Ravnborg <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: [email protected]
> Cc: Arnd Bergmann <[email protected]>
> Cc: Andreas Larsson <[email protected]>

Applied to my for-next branch.

Thanks,
Andreas