Commit 62cda74c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bootconfig-fixes-v7.0-rc3' of... 

Merge tag 'bootconfig-fixes-v7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull bootconfig fixes from Masami Hiramatsu:

 - fix off-by-one in xbc_verify_tree() unclosed brace error. This fixes
   a wrong error place in unclosed brace error message

 - check bounds before writing in __xbc_open_brace(). This fixes to
   check the array index before setting array, so that the bootconfig
   can support 16th-depth nested brace correctly

 - fix snprintf truncation check in xbc_node_compose_key_after(). This
   fixes to handle the return value of snprintf() correctly in case of
   the return value == size

 - Add bootconfig tests about braces Add test cases for checking error
   position about unclosed brace and ensuring supporting 16th depth
   nested braces correctly

* tag 'bootconfig-fixes-v7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: Add bootconfig tests about braces
  lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
  lib/bootconfig: check bounds before writing in __xbc_open_brace()
  lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error
parents 11e8c7e9 e2715ea5

lib/bootconfig.c

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ int __init xbc_node_compose_key_after(struct xbc_node *root, 
			       depth ? "." : "");

		if (ret < 0)

			return ret;

		if (ret > size) {

		if (ret >= size) {

			size = 0;

		} else {

			size -= ret;
@@ -532,9 +532,9 @@ static char *skip_spaces_until_newline(char *p) 
static int __init __xbc_open_brace(char *p)

{

	/* Push the last key as open brace */

	open_brace[brace_index++] = xbc_node_index(last_parent);

	if (brace_index >= XBC_DEPTH_MAX)

		return xbc_parse_error("Exceed max depth of braces", p);

	open_brace[brace_index++] = xbc_node_index(last_parent);



	return 0;

}
@@ -802,7 +802,7 @@ static int __init xbc_verify_tree(void) 


	/* Brace closing */

	if (brace_index) {

		n = &xbc_nodes[open_brace[brace_index]];

		n = &xbc_nodes[open_brace[brace_index - 1]];

		return xbc_parse_error("Brace is not closed",

					xbc_node_get_data(n));

	}

tools/bootconfig/samples/bad-non-closed-brace.bconf

0 → 100644
+4 −0
Original line number Diff line number Diff line 
foo {

 bar {

   buz

 }

tools/bootconfig/samples/bad-over-max-brace.bconf

0 → 100644
+19 −0
Original line number Diff line number Diff line 
key1 {

key2 {

key3 {

key4 {

key5 {

key6 {

key7 {

key8 {

key9 {

key10 {

key11 {

key12 {

key13 {

key14 {

key15 {

key16 {

key17 {

}}}}}}}}}}}}}}}}}

tools/bootconfig/samples/exp-good-nested-brace.bconf

0 → 100644
+1 −0
Original line number Diff line number Diff line 
key1.key2.key3.key4.key5.key6.key7.key8.key9.key10.key11.key12.key13.key14.key15.key16;

tools/bootconfig/samples/good-nested-brace.bconf

0 → 100644
+18 −0
Original line number Diff line number Diff line 
key1 {

key2 {

key3 {

key4 {

key5 {

key6 {

key7 {

key8 {

key9 {

key10 {

key11 {

key12 {

key13 {

key14 {

key15 {

key16 {

}}}}}}}}}}}}}}}}