diff mbox series

sparc: vDSO: fix return value of __setup handler

Message ID 20220312042144.15470-1-rdunlap@infradead.org
State New
Headers show
Series sparc: vDSO: fix return value of __setup handler | expand

Commit Message

Randy Dunlap March 12, 2022, 4:21 a.m. UTC
__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: 62d6f3b7b85e ("sparc: vDSO: Silence an uninitialized variable warning")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
From: Igor Zhbanov <i.zhbanov@omprussia.ru>
Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>
---
 arch/sparc/vdso/vma.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Dan Carpenter March 12, 2022, 7:05 a.m. UTC | #1
On Fri, Mar 11, 2022 at 08:21:44PM -0800, 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: 62d6f3b7b85e ("sparc: vDSO: Silence an uninitialized variable warning")

This fixes tag is wrong.  My patch did not change the return values at
all.

regards,
dan carpenter
diff mbox series

Patch

--- linux-next-20220309.orig/arch/sparc/vdso/vma.c
+++ linux-next-20220309/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);