Commit bb288d7d authored by Josh Law's avatar Josh Law Committed by Masami Hiramatsu (Google)
Browse files

lib/bootconfig: check xbc_init_node() return in override path

The ':=' override path in xbc_parse_kv() calls xbc_init_node() to
re-initialize an existing value node but does not check the return
value. If xbc_init_node() fails (data offset out of range), parsing
silently continues with stale node data.

Add the missing error check to match the xbc_add_node() call path
which already checks for failure.

In practice, a bootconfig using ':=' to override a value near the
32KB data limit could silently retain the old value, meaning a
security-relevant boot parameter override (e.g., a trace filter or
debug setting) would not take effect as intended.

Link: https://lore.kernel.org/all/20260318155847.78065-2-objecting@objecting.org/



Fixes: e5efaeb8 ("bootconfig: Support mixing a value and subkeys under a key")
Signed-off-by: default avatarJosh Law <objecting@objecting.org>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent f338e773
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -723,7 +723,8 @@ static int __init xbc_parse_kv(char **k, char *v, int op)
		if (op == ':') {
			unsigned short nidx = child->next;

			xbc_init_node(child, v, XBC_VALUE);
			if (xbc_init_node(child, v, XBC_VALUE) < 0)
				return xbc_parse_error("Failed to override value", v);
			child->next = nidx;	/* keep subkeys */
			goto array;
		}