Skip to content

Commit 8648949

Browse files
rddunlapgregkh
authored andcommitted
mm/usercopy: return 1 from hardened_usercopy __setup() handler
commit 05fe3c1 upstream. __setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; it just pollutes init's environment). This prevents: Unknown kernel command line parameters \ "BOOT_IMAGE=/boot/bzImage-517rc5 hardened_usercopy=off", will be \ passed to user space. Run /sbin/init as init process with arguments: /sbin/init with environment: HOME=/ TERM=linux BOOT_IMAGE=/boot/bzImage-517rc5 hardened_usercopy=off or hardened_usercopy=on but when "hardened_usercopy=foo" is used, there is no Unknown kernel command line parameter. Return 1 to indicate that the boot option has been handled. Print a warning if strtobool() returns an error on the option string, but do not mark this as in unknown command line option and do not cause init's environment to be polluted with this string. Link: https://lkml.kernel.org/r/20220222034249.14795-1-rdunlap@infradead.org Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Fixes: b5cb15d ("usercopy: Allow boot cmdline disabling of hardening") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru> Acked-by: Chris von Recklinghausen <crecklin@redhat.com> Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 81a04b9 commit 8648949

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

mm/usercopy.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,10 @@ static bool enable_checks __initdata = true;
294294

295295
static int __init parse_hardened_usercopy(char *str)
296296
{
297-
return strtobool(str, &enable_checks);
297+
if (strtobool(str, &enable_checks))
298+
pr_warn("Invalid option string for hardened_usercopy: '%s'\n",
299+
str);
300+
return 1;
298301
}
299302

300303
__setup("hardened_usercopy=", parse_hardened_usercopy);

0 commit comments

Comments
 (0)