Commit c7af4ecd authored Sep 21, 2020 by Masami Hiramatsu Committed by Steven Rostedt (VMware) Sep 21, 2020

lib/bootconfig: Fix to remove tailing spaces after value

Fix to remove tailing spaces after value. If there is a space
after value, the bootconfig failed to remove it because it
applies strim() before replacing the delimiter with null.

For example,

foo = var    # comment

was parsed as below.

foo="var    "

but user will expect

foo="var"

This fixes it by applying strim() after removing the delimiter.

Link: https://lkml.kernel.org/r/160068149134.1088739.8868306567670058853.stgit@devnote2



Fixes: 76db5a27 ("bootconfig: Add Extra Boot Config support")
Cc: Ingo Molnar <mingo@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent ead1e19a

lib/bootconfig.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -494,8 +494,8 @@ static int __init __xbc_parse_value(char __v, char __n)
		break;
		}
		if (strchr(",;\n#}", c)) {
		v = strim(v);
		*p++ = '\0';
		v = strim(v);
		break;
		}
		}

Admin message