On Sat, 13 Jun 2020 00:23:18 +0900
Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote:
> Fix /proc/bootconfig to show the correctly choose the
> double or single quotes according to the value.
Oops, I missed to remove "show".
Fix /proc/bootconfig to correctly choose the
double or single quotes according to the value.
>
> If a bootconfig value includes a double quote character,
> we must use single-quotes to quote that value.
>
> Fixes: c1a3c36017d4 ("proc: bootconfig: Add /proc/bootconfig to show boot config list")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> ---
> fs/proc/bootconfig.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c
> index 9955d75c0585..930d1dae33eb 100644
> --- a/fs/proc/bootconfig.c
> +++ b/fs/proc/bootconfig.c
> @@ -27,6 +27,7 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
> {
> struct xbc_node *leaf, *vnode;
> const char *val;
> + char q;
> char *key, *end = dst + size;
> int ret = 0;
>
> @@ -41,16 +42,20 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
> break;
> dst += ret;
> vnode = xbc_node_get_child(leaf);
> - if (vnode && xbc_node_is_array(vnode)) {
> + if (vnode) {
> xbc_array_for_each_value(vnode, val) {
> - ret = snprintf(dst, rest(dst, end), "\"%s\"%s",
> - val, vnode->next ? ", " : "\n");
> + if (strchr(val, '"'))
> + q = '\'';
> + else
> + q = '"';
> + ret = snprintf(dst, rest(dst, end), "%c%s%c%s",
> + q, val, q, vnode->next ? ", " : "\n");
> if (ret < 0)
> goto out;
> dst += ret;
> }
> } else {
> - ret = snprintf(dst, rest(dst, end), "\"%s\"\n", val);
> + ret = snprintf(dst, rest(dst, end), "\"\"\n");
> if (ret < 0)
> break;
> dst += ret;
>
--
Masami Hiramatsu
