Subject: [PATCH 5.10 425/599] tty: hvc: fix return value of __setup handler

From: Greg Kroah-Hartman <[email-masked]>
Date: Tue, 5 Apr 2022 09:31:59 +0200

From: Randy Dunlap <[email-masked]>

[ Upstream commit 53819a0d97aace1425bb042829e3446952a9e8a9 ]

__setup() handlers should return 1 to indicate that the boot option
has been handled or 0 to indicate that it was not handled.
Add a pr_warn() message if the option value is invalid and then
always return 1.

Link: lore.kernel.org/r/[email-masked]
Fixes: 86b40567b917 ("tty: replace strict_strtoul() with kstrtoul()")
Cc: Jingoo Han <[email-masked]>
Cc: Greg Kroah-Hartman <[email-masked]>
Cc: Jiri Slaby <[email-masked]>
Cc: Michael Ellerman <[email-masked]>
Cc: Julian Wiedmann <[email-masked]>
Cc: Vasily Gorbik <[email-masked]>
Cc: [email-masked]
Reported-by: Igor Zhbanov <[email-masked]>
Signed-off-by: Randy Dunlap <[email-masked]>
Link: https://lore.kernel.org/r/[email-masked]
Signed-off-by: Greg Kroah-Hartman <[email-masked]>
Signed-off-by: Sasha Levin <[email-masked]>
---
 drivers/tty/hvc/hvc_iucv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index 2af1e5751bd6..796fbff623f6 100644
--- a/drivers/tty/hvc/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
@@ -1470,7 +1470,9 @@ static int __init hvc_iucv_init(void)
  */
 static	int __init hvc_iucv_config(char *val)
 {
-	 return kstrtoul(val, 10, &hvc_iucv_devices);
+	if (kstrtoul(val, 10, &hvc_iucv_devices))
+		pr_warn("hvc_iucv= invalid parameter value '%s'\n", val);
+	return 1;
 }

-- 
2.34.1