PM: hibernate: fix __setup handler error handling

BugLink: https://bugs.launchpad.net/bugs/1969110
[ 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>
(cherry picked from commit d0cd9da501f65545c02cb7a220061e52c9e4b222)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b0888e9224da3b4a81045ec9b7abc69c82334644..d926852f81191f38b1706300e7c3416183a66c84 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1326,7 +1326,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;
 }