Commit 829000f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull bootconfig updates from Masami Hiramatsu:
 "Minor fixes for handling errors:
   - fix off-by-one in xbc_verify_tree() next node check
   - increment xbc_node_num after node init succeeds
   - validate child node index in xbc_verify_tree()

  Code cleanups (mainly type/attribute changes):
   - clean up comment typos and bracing
   - drop redundant memset of xbc_nodes
   - replace linux/kernel.h with specific includes
   - narrow flag parameter type from uint32_t to uint16_t
   - constify xbc_calc_checksum() data parameter
   - fix signed comparison in xbc_node_get_data()
   - use size_t for strlen result in xbc_node_match_prefix()
   - use signed type for offset in xbc_init_node()
   - use size_t for key length tracking in xbc_verify_tree()
   - change xbc_node_index() return type to uint16_t"

* tag 'bootconfig-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  lib/bootconfig: change xbc_node_index() return type to uint16_t
  lib/bootconfig: use size_t for key length tracking in xbc_verify_tree()
  lib/bootconfig: use signed type for offset in xbc_init_node()
  lib/bootconfig: use size_t for strlen result in xbc_node_match_prefix()
  lib/bootconfig: fix signed comparison in xbc_node_get_data()
  lib/bootconfig: validate child node index in xbc_verify_tree()
  lib/bootconfig: replace linux/kernel.h with specific includes
  bootconfig: constify xbc_calc_checksum() data parameter
  lib/bootconfig: drop redundant memset of xbc_nodes
  lib/bootconfig: increment xbc_node_num after node init succeeds
  lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check
  lib/bootconfig: narrow flag parameter type from uint32_t to uint16_t
  lib/bootconfig: clean up comment typos and bracing
parents d730905b 6eb255d0

include/linux/bootconfig.h

+3 −3
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ bool __init cmdline_has_extra_options(void); 
 * The checksum will be used with the BOOTCONFIG_MAGIC and the size for

 * embedding the bootconfig in the initrd image.

 */

static inline __init uint32_t xbc_calc_checksum(void *data, uint32_t size)

static inline __init uint32_t xbc_calc_checksum(const void *data, uint32_t size)

{

	unsigned char *p = data;

	const unsigned char *p = data;

	uint32_t ret = 0;



	while (size--)
@@ -66,7 +66,7 @@ struct xbc_node { 


/* Node tree access raw APIs */

struct xbc_node * __init xbc_root_node(void);

int __init xbc_node_index(struct xbc_node *node);

uint16_t __init xbc_node_index(struct xbc_node *node);

struct xbc_node * __init xbc_node_get_parent(struct xbc_node *node);

struct xbc_node * __init xbc_node_get_child(struct xbc_node *node);

struct xbc_node * __init xbc_node_get_next(struct xbc_node *node);

lib/bootconfig.c

+36 −26
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include <linux/bug.h>

#include <linux/ctype.h>

#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/cache.h>

#include <linux/compiler.h>

#include <linux/sprintf.h>

#include <linux/memblock.h>

#include <linux/string.h>
@@ -71,7 +73,7 @@ static inline void __init xbc_free_mem(void *addr, size_t size, bool early) 


static inline void *xbc_alloc_mem(size_t size)

{

	return malloc(size);

	return calloc(1, size);

}



static inline void xbc_free_mem(void *addr, size_t size, bool early)
@@ -79,6 +81,7 @@ static inline void xbc_free_mem(void *addr, size_t size, bool early) 
	free(addr);

}

#endif



/**

 * xbc_get_info() - Get the information of loaded boot config

 * @node_size: A pointer to store the number of nodes.
@@ -112,7 +115,7 @@ static int __init xbc_parse_error(const char *msg, const char *p) 
 * xbc_root_node() - Get the root node of extended boot config

 *

 * Return the address of root node of extended boot config. If the

 * extended boot config is not initiized, return NULL.

 * extended boot config is not initialized, return NULL.

 */

struct xbc_node * __init xbc_root_node(void)

{
@@ -128,9 +131,9 @@ struct xbc_node * __init xbc_root_node(void) 
 *

 * Return the index number of @node in XBC node list.

 */

int __init xbc_node_index(struct xbc_node *node)

uint16_t __init xbc_node_index(struct xbc_node *node)

{

	return node - &xbc_nodes[0];

	return (uint16_t)(node - &xbc_nodes[0]);

}



/**
@@ -180,7 +183,7 @@ struct xbc_node * __init xbc_node_get_next(struct xbc_node *node) 
 */

const char * __init xbc_node_get_data(struct xbc_node *node)

{

	int offset = node->data & ~XBC_VALUE;

	size_t offset = node->data & ~XBC_VALUE;



	if (WARN_ON(offset >= xbc_data_size))

		return NULL;
@@ -192,7 +195,7 @@ static bool __init 
xbc_node_match_prefix(struct xbc_node *node, const char **prefix)

{

	const char *p = xbc_node_get_data(node);

	int len = strlen(p);

	size_t len = strlen(p);



	if (strncmp(*prefix, p, len))

		return false;
@@ -364,7 +367,7 @@ struct xbc_node * __init xbc_node_find_next_leaf(struct xbc_node *root, 
			node = xbc_node_get_parent(node);

			if (node == root)

				return NULL;

			/* User passed a node which is not uder parent */

			/* User passed a node which is not under parent */

			if (WARN_ON(!node))

				return NULL;

		}
@@ -407,11 +410,11 @@ const char * __init xbc_node_find_next_key_value(struct xbc_node *root, 


/* XBC parse and tree build */



static int __init xbc_init_node(struct xbc_node *node, char *data, uint32_t flag)

static int __init xbc_init_node(struct xbc_node *node, char *data, uint16_t flag)

{

	unsigned long offset = data - xbc_data;

	long offset = data - xbc_data;



	if (WARN_ON(offset >= XBC_DATA_MAX))

	if (WARN_ON(offset < 0 || offset >= XBC_DATA_MAX))

		return -EINVAL;



	node->data = (uint16_t)offset | flag;
@@ -421,16 +424,17 @@ static int __init xbc_init_node(struct xbc_node *node, char *data, uint32_t flag 
	return 0;

}



static struct xbc_node * __init xbc_add_node(char *data, uint32_t flag)

static struct xbc_node * __init xbc_add_node(char *data, uint16_t flag)

{

	struct xbc_node *node;



	if (xbc_node_num == XBC_NODE_MAX)

		return NULL;



	node = &xbc_nodes[xbc_node_num++];

	node = &xbc_nodes[xbc_node_num];

	if (xbc_init_node(node, data, flag) < 0)

		return NULL;

	xbc_node_num++;



	return node;

}
@@ -451,7 +455,7 @@ static inline __init struct xbc_node *xbc_last_child(struct xbc_node *node) 
	return node;

}



static struct xbc_node * __init __xbc_add_sibling(char *data, uint32_t flag, bool head)

static struct xbc_node * __init __xbc_add_sibling(char *data, uint16_t flag, bool head)

{

	struct xbc_node *sib, *node = xbc_add_node(data, flag);
@@ -472,23 +476,24 @@ static struct xbc_node * __init __xbc_add_sibling(char *data, uint32_t flag, boo 
				sib->next = xbc_node_index(node);

			}

		}

	} else

	} else {

		xbc_parse_error("Too many nodes", data);

	}



	return node;

}



static inline struct xbc_node * __init xbc_add_sibling(char *data, uint32_t flag)

static inline struct xbc_node * __init xbc_add_sibling(char *data, uint16_t flag)

{

	return __xbc_add_sibling(data, flag, false);

}



static inline struct xbc_node * __init xbc_add_head_sibling(char *data, uint32_t flag)

static inline struct xbc_node * __init xbc_add_head_sibling(char *data, uint16_t flag)

{

	return __xbc_add_sibling(data, flag, true);

}



static inline __init struct xbc_node *xbc_add_child(char *data, uint32_t flag)

static inline __init struct xbc_node *xbc_add_child(char *data, uint16_t flag)

{

	struct xbc_node *node = xbc_add_sibling(data, flag);
@@ -655,9 +660,9 @@ static int __init __xbc_add_key(char *k) 
	if (unlikely(xbc_node_num == 0))

		goto add_node;



	if (!last_parent)	/* the first level */

	if (!last_parent) {	/* the first level */

		node = find_match_node(xbc_nodes, k);

	else {

	} else {

		child = xbc_node_get_child(last_parent);

		/* Since the value node is the first child, skip it. */

		if (child && xbc_node_is_value(child))
@@ -665,9 +670,9 @@ static int __init __xbc_add_key(char *k) 
		node = find_match_node(child, k);

	}



	if (node)

	if (node) {

		last_parent = node;

	else {

	} else {

add_node:

		node = xbc_add_child(k, XBC_KEY);

		if (!node)
@@ -798,7 +803,8 @@ static int __init xbc_close_brace(char **k, char *n) 


static int __init xbc_verify_tree(void)

{

	int i, depth, len, wlen;

	int i, depth;

	size_t len, wlen;

	struct xbc_node *n, *m;



	/* Brace closing */
@@ -815,10 +821,14 @@ static int __init xbc_verify_tree(void) 
	}



	for (i = 0; i < xbc_node_num; i++) {

		if (xbc_nodes[i].next > xbc_node_num) {

		if (xbc_nodes[i].next >= xbc_node_num) {

			return xbc_parse_error("No closing brace",

				xbc_node_get_data(xbc_nodes + i));

		}

		if (xbc_nodes[i].child >= xbc_node_num) {

			return xbc_parse_error("Broken child node",

				xbc_node_get_data(xbc_nodes + i));

		}

	}



	/* Key tree limitation check */
@@ -980,7 +990,6 @@ int __init xbc_init(const char *data, size_t size, const char **emsg, int *epos) 
		_xbc_exit(true);

		return -ENOMEM;

	}

	memset(xbc_nodes, 0, sizeof(struct xbc_node) * XBC_NODE_MAX);



	ret = xbc_parse_tree();

	if (!ret)
@@ -992,8 +1001,9 @@ int __init xbc_init(const char *data, size_t size, const char **emsg, int *epos) 
		if (emsg)

			*emsg = xbc_err_msg;

		_xbc_exit(true);

	} else

	} else {

		ret = xbc_node_num;

	}



	return ret;

}