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

PM: suspend: fix return value of __setup handler



[ Upstream commit 7a64ca17e4dd50d5f910769167f3553902777844 ]

If an invalid option is given for "test_suspend=<option>", the entire
string is added to init's environment, so return 1 instead of 0 from
the __setup handler.

  Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
    test_suspend=invalid"

and

 Run /sbin/init as init process
   with arguments:
     /sbin/init
   with environment:
     HOME=/
     TERM=linux
     BOOT_IMAGE=/boot/bzImage-517rc5
     test_suspend=invalid

Fixes: 2ce98689 ("PM / sleep: Enhance test_suspend option with repeat capability")
Fixes: 27ddcc65 ("PM / sleep: Add state field to pm_states[] entries")
Fixes: a9d70523 ("PM: Separate suspend to RAM functionality from core")
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 6c4c026c

kernel/power/suspend_test.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -157,22 +157,22 @@ static int __init setup_test_suspend(char *value)
		value++;
		suspend_type = strsep(&value, ",");
		if (!suspend_type)
		return 0;
		return 1;

		repeat = strsep(&value, ",");
		if (repeat) {
		if (kstrtou32(repeat, 0, &test_repeat_count_max))
		return 0;
		return 1;
		}

		for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
		if (!strcmp(pm_labels[i], suspend_type)) {
		test_state_label = pm_labels[i];
		return 0;
		return 1;
		}

		printk(warn_bad_state, suspend_type);
		return 0;
		return 1;
		}
		__setup("test_suspend", setup_test_suspend);