Re: [PATCH] PM/hibernate: fix __setup handler error handling

From: Rafael J. Wysocki
Date: Tue Mar 01 2022 - 12:52:11 EST


On Mon, Feb 28, 2022 at 11:05 PM Randy Dunlap <rdunlap@xxxxxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxxx>
> Reported-by: Igor Zhbanov <i.zhbanov@xxxxxxxxxxxx>
> Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@xxxxxxxxxxxx
> Cc: Fabian Frederick <fabf@xxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxx>
> Cc: linux-pm@xxxxxxxxxxxxxxx
> Cc: Len Brown <len.brown@xxxxxxxxx>
> ---
> kernel/power/hibernate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20220228.orig/kernel/power/hibernate.c
> +++ linux-next-20220228/kernel/power/hibernate.c
> @@ -1329,7 +1329,7 @@ static int __init resumedelay_setup(char
> int rc = kstrtouint(str, 0, &resume_delay);
>
> if (rc)
> - return rc;
> + pr_warn("resumedelay: bad option string '%s'\n", str);
> return 1;
> }

Applied as 5.18 material, thanks!