diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-21 08:46:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-21 08:46:13 -0700 |
| commit | 55d55b97c7fca1f795029c5aea3335a5d885632e (patch) | |
| tree | 7c66a7c34aca62d09cfba6f1418b4dbf93be0846 /lib | |
| parent | 8991448e56cb2118b561eeda193af53b4ff6b632 (diff) | |
| parent | 3b2c2ab4ceb82af484310c3087541eab00ea288b (diff) | |
Merge tag 'bootconfig-fixes-v7.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull bootconfig fixes from Masami Hiramatsu:
- Check error code of xbc_init_node() in override value path in
xbc_parse_kv()
- Fix fd leak in load_xbc_file() on fstat failure
* tag 'bootconfig-fixes-v7.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
lib/bootconfig: check xbc_init_node() return in override path
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootconfig.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bootconfig.c b/lib/bootconfig.c index 2da049216fe0..e88d0221a826 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -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; } |