public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@redhat.com>,
	Masami Hiramatsu <mhiramat@kernel.org>
Subject: [PATCH 2/4] lib/bootconfig: Fix to remove tailing spaces after value
Date: Mon, 21 Sep 2020 18:44:51 +0900	[thread overview]
Message-ID: <160068149134.1088739.8868306567670058853.stgit@devnote2> (raw)
In-Reply-To: <160068147328.1088739.7282405187565509762.stgit@devnote2>

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.

Fixes: 76db5a27a827 ("bootconfig: Add Extra Boot Config support")
Cc: stable@vger.kernel.org
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 0 files changed

diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index b44bba0f1583..649ed44f199c 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -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;
 		}
 	}


  parent reply	other threads:[~2020-09-21  9:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-21  9:44 [PATCH 0/4] bootconfig: Fix a parser bug Masami Hiramatsu
2020-09-21  9:44 ` [PATCH 1/4] lib/bootconfig: Fix a bug of breaking existing tree nodes Masami Hiramatsu
2020-09-21  9:44 ` Masami Hiramatsu [this message]
2020-09-21  9:45 ` [PATCH 3/4] tools/bootconfig: Add testcases for repeated key with brace Masami Hiramatsu
2020-09-21  9:45 ` [PATCH 4/4] tools/bootconfig: Add testcase for tailing space Masami Hiramatsu
2020-09-21  9:56 ` bootconfig: Fix parser bugs (Re: [PATCH 0/4] bootconfig: Fix a parser bug) Masami Hiramatsu
2020-09-23  5:30 ` [PATCH 0/4] bootconfig: Fix a parser bug Masami Hiramatsu
2020-09-23 14:49   ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=160068149134.1088739.8868306567670058853.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox