From: Randy Dunlap <rdunlap@infradead.org>
Date: Mon, 28 Feb 2022 22:05:32 +0000 (-0800)
Subject: PM: hibernate: fix __setup handler error handling
X-Git-Tag: v5.17.2~886
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=086e6c674bef0eade96e5115e64cf0945878ff15;p=users%2Fdwmw2%2Flinux.git

PM: hibernate: fix __setup handler error handling

[ Upstream commit ba7ffcd4c4da374b0f64666354eeeda7d3827131 ]

If an invalid value is used in "resumedelay=<seconds>", it is
silently ignored. Add a warning message and then let the __setup
handler return 1 to indicate that the kernel command line option
has been handled.

Fixes: 317cf7e5e85e3 ("PM / hibernate: convert simple_strtoul to kstrtoul")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru>
Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index e6af502c2fd77..08780a466fdf7 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1328,7 +1328,7 @@ static int __init resumedelay_setup(char *str)
 	int rc = kstrtouint(str, 0, &resume_delay);
 
 	if (rc)
-		return rc;
+		pr_warn("resumedelay: bad option string '%s'\n", str);
 	return 1;
 }