lkml.org 
[lkml]   [2020]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[for-next][PATCH 3/5] bootconfig: Add more parse error messages
From: Masami Hiramatsu <mhiramat@kernel.org>

Add more error messages for following cases.
- Exceeding max number of nodes
- Config tree data is empty (e.g. comment only)
- Config data is empty or exceeding max size
- bootconfig is already initialized

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

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
lib/bootconfig.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 055014e233a5..a98ae136529c 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -373,7 +373,8 @@ static struct xbc_node * __init xbc_add_sibling(char *data, u32 flag)
sib->next = xbc_node_index(node);
}
}
- }
+ } else
+ xbc_parse_error("Too many nodes", data);

return node;
}
@@ -657,8 +658,10 @@ static int __init xbc_verify_tree(void)
struct xbc_node *n, *m;

/* Empty tree */
- if (xbc_node_num == 0)
+ if (xbc_node_num == 0) {
+ xbc_parse_error("Empty config", xbc_data);
return -ENOENT;
+ }

for (i = 0; i < xbc_node_num; i++) {
if (xbc_nodes[i].next > xbc_node_num) {
@@ -732,12 +735,17 @@ int __init xbc_init(char *buf)
char *p, *q;
int ret, c;

- if (xbc_data)
+ if (xbc_data) {
+ pr_err("Error: bootconfig is already initialized.\n");
return -EBUSY;
+ }

ret = strlen(buf);
- if (ret > XBC_DATA_MAX - 1 || ret == 0)
+ if (ret > XBC_DATA_MAX - 1 || ret == 0) {
+ pr_err("Error: Config data is %s.\n",
+ ret ? "too big" : "empty");
return -ERANGE;
+ }

xbc_data = buf;
xbc_data_size = ret + 1;
--
2.24.1

\
 
 \ /
  Last update: 2020-02-05 23:22    [W:0.045 / U:0.448 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site