From: Tiwei Bie Date: Fri, 11 Oct 2024 04:04:35 +0000 (+0800) Subject: um: Do not propagate uml_dir parameter to kernel X-Git-Tag: v6.13-rc1~18^2~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c78a58388e732974986832e6f70c7f58ee3415e;p=thirdparty%2Fkernel%2Flinux.git um: Do not propagate uml_dir parameter to kernel This parameter is UML specific and is unknown to kernel. It should not be propagated to kernel, otherwise it will be passed to user space as an environment option by kernel with a warning like: Unknown kernel command line parameters "uml_dir=/foo", will be passed to user space. Signed-off-by: Tiwei Bie Link: https://patch.msgid.link/20241011040441.1586345-4-tiwei.btw@antgroup.com Signed-off-by: Johannes Berg --- diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c index e09d65b05d1ca..eb523ab1e2189 100644 --- a/arch/um/os-Linux/umid.c +++ b/arch/um/os-Linux/umid.c @@ -358,6 +358,8 @@ char *get_umid(void) static int __init set_uml_dir(char *name, int *add) { + *add = 0; + if (*name == '\0') { os_warn("uml_dir can't be an empty string\n"); return 0;