mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 07:33:56 +00:00
4e264ffd95
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>
95 lines
1.9 KiB
C
95 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* /proc/bootconfig - Extra boot configuration
|
|
*/
|
|
#include <linux/fs.h>
|
|
#include <linux/init.h>
|
|
#include <linux/printk.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/bootconfig.h>
|
|
#include <linux/slab.h>
|
|
|
|
static char *saved_boot_config;
|
|
|
|
static int boot_config_proc_show(struct seq_file *m, void *v)
|
|
{
|
|
if (saved_boot_config)
|
|
seq_puts(m, saved_boot_config);
|
|
return 0;
|
|
}
|
|
|
|
/* Rest size of buffer */
|
|
#define rest(dst, end) ((end) > (dst) ? (end) - (dst) : 0)
|
|
|
|
/* Return the needed total length if @size is 0 */
|
|
static int __init copy_xbc_key_value_list(char *dst, size_t size)
|
|
{
|
|
struct xbc_node *leaf, *vnode;
|
|
char *key, *end = dst + size;
|
|
const char *val;
|
|
char q;
|
|
int ret = 0;
|
|
|
|
key = kzalloc(XBC_KEYLEN_MAX, GFP_KERNEL);
|
|
|
|
xbc_for_each_key_value(leaf, val) {
|
|
ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
|
|
if (ret < 0)
|
|
break;
|
|
ret = snprintf(dst, rest(dst, end), "%s = ", key);
|
|
if (ret < 0)
|
|
break;
|
|
dst += ret;
|
|
vnode = xbc_node_get_child(leaf);
|
|
if (vnode) {
|
|
xbc_array_for_each_value(vnode, val) {
|
|
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), "\"\"\n");
|
|
if (ret < 0)
|
|
break;
|
|
dst += ret;
|
|
}
|
|
}
|
|
out:
|
|
kfree(key);
|
|
|
|
return ret < 0 ? ret : dst - (end - size);
|
|
}
|
|
|
|
static int __init proc_boot_config_init(void)
|
|
{
|
|
int len;
|
|
|
|
len = copy_xbc_key_value_list(NULL, 0);
|
|
if (len < 0)
|
|
return len;
|
|
|
|
if (len > 0) {
|
|
saved_boot_config = kzalloc(len + 1, GFP_KERNEL);
|
|
if (!saved_boot_config)
|
|
return -ENOMEM;
|
|
|
|
len = copy_xbc_key_value_list(saved_boot_config, len + 1);
|
|
if (len < 0) {
|
|
kfree(saved_boot_config);
|
|
return len;
|
|
}
|
|
}
|
|
|
|
proc_create_single("bootconfig", 0, NULL, boot_config_proc_show);
|
|
|
|
return 0;
|
|
}
|
|
fs_initcall(proc_boot_config_init);
|