Commit efee03a5 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Masami Hiramatsu (Google)

bootconfig: do not put quotes on cmdline items unless necessary

When trying to migrate to using bootconfig to embed the kernel's and
PID1's command line with the kernel image itself, and so allowing
changing that without modifying the bootloader, I noticed that
/proc/cmdline changed from e.g.

  console=ttymxc0,115200n8 cma=128M quiet -- --log-level=notice

to

  console="ttymxc0,115200n8" cma="128M" quiet -- --log-level="notice"

The kernel parameters are parsed just fine, and the quotes are indeed
stripped from the actual argv[] given to PID1. However, the quoting
doesn't really serve any purpose and looks excessive, and might
confuse some (naive) userspace tool trying to parse /proc/cmdline. So
do not quote the value unless it contains whitespace.

Link: https://lore.kernel.org/all/20240308124401.1702046-1-linux@rasmusvillemoes.dk/Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent 46dad3c1
...@@ -327,7 +327,7 @@ static int __init xbc_snprint_cmdline(char *buf, size_t size, ...@@ -327,7 +327,7 @@ static int __init xbc_snprint_cmdline(char *buf, size_t size,
{ {
struct xbc_node *knode, *vnode; struct xbc_node *knode, *vnode;
char *end = buf + size; char *end = buf + size;
const char *val; const char *val, *q;
int ret; int ret;
xbc_node_for_each_key_value(root, knode, val) { xbc_node_for_each_key_value(root, knode, val) {
...@@ -345,8 +345,9 @@ static int __init xbc_snprint_cmdline(char *buf, size_t size, ...@@ -345,8 +345,9 @@ static int __init xbc_snprint_cmdline(char *buf, size_t size,
continue; continue;
} }
xbc_array_for_each_value(vnode, val) { xbc_array_for_each_value(vnode, val) {
ret = snprintf(buf, rest(buf, end), "%s=\"%s\" ", q = strpbrk(val, " \t\r\n") ? "\"" : "";
xbc_namebuf, val); ret = snprintf(buf, rest(buf, end), "%s=%s%s%s ",
xbc_namebuf, q, val, q);
if (ret < 0) if (ret < 0)
return ret; return ret;
buf += ret; buf += ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment