Commit 6c4c026c authored Feb 28, 2022 by Randy Dunlap Committed by Greg Kroah-Hartman Apr 15, 2022

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: 317cf7e5 ("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>

parent 84fe3ca6

kernel/power/hibernate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1216,7 +1216,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;
		}