leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proc/bootconfig: Fix to use correct quotes for value

Browse Source 
Fix /proc/bootconfig to select double or single quotes
corrctly according to the value.

If a bootconfig value includes a double quote character,
we must use single-quotes to quote that value.

This modifies if() condition and blocks for avoiding
double-quote in value check in 2 places. Anyway, since
xbc_array_for_each_value() can handle the array which
has a single node correctly.
Thus,

if (vnode && xbc_node_is_array(vnode)) {
	xbc_array_for_each_value(vnode)	/* vnode->next != NULL */
		...
} else {
	snprintf(val); /* val is an empty string if !vnode */
}

is equivalent to

if (vnode) {
	xbc_array_for_each_value(vnode)	/* vnode->next can be NULL */
		...
} else {
	snprintf("");	/* value is always empty */
}

Link: http://lkml.kernel.org/r/159230244786.65555.3763894451251622488.stgit@devnote2

Cc: stable@vger.kernel.org
Fixes: c1a3c36017 ("proc: bootconfig: Add /proc/bootconfig to show boot config list")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2020-06-16 19:14:08 +09:00 committed by Steven Rostedt (VMware)
parent 69243720c0
commit 4e264ffd95
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/proc/bootconfig.c
View File

@ -26,8 +26,9 @@ static int boot_config_proc_show(struct seq_file *m, void *v)
static int __init copy_xbc_key_value_list(char *dst, size_t size) static int __init copy_xbc_key_value_list(char *dst, size_t size)
{ {
struct xbc_node *leaf, *vnode; struct xbc_node *leaf, *vnode;
const char *val;
char *key, *end = dst + size; char *key, *end = dst + size;
const char *val;
char q;
int ret = 0; int ret = 0;
key = kzalloc(XBC_KEYLEN_MAX, GFP_KERNEL); key = kzalloc(XBC_KEYLEN_MAX, GFP_KERNEL);
@ -41,16 +42,20 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
break; break;
dst += ret; dst += ret;
vnode = xbc_node_get_child(leaf); vnode = xbc_node_get_child(leaf);
if (vnode && xbc_node_is_array(vnode)) { if (vnode) {
xbc_array_for_each_value(vnode, val) { xbc_array_for_each_value(vnode, val) {
ret = snprintf(dst, rest(dst, end), "\"%s\"%s", if (strchr(val, '"'))
val, vnode->next ? ", " : "\n"); q = '\'';
else
q = '"';
ret = snprintf(dst, rest(dst, end), "%c%s%c%s",
q, val, q, vnode->next ? ", " : "\n");
if (ret < 0) if (ret < 0)
goto out; goto out;
dst += ret; dst += ret;
} }
} else { } else {
ret = snprintf(dst, rest(dst, end), "\"%s\"\n", val); ret = snprintf(dst, rest(dst, end), "\"\"\n");
if (ret < 0) if (ret < 0)
break; break;
dst += ret; dst += ret;