diff options
| author | Julio Faracco <jcfaracco@gmail.com> | 2021-09-04 17:54:38 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-09-08 21:28:50 +0200 |
| commit | 903bd067faa837fddb6e5c8b740c3374dc582f04 (patch) | |
| tree | de3a0277f302b7a2f6177e55381bf7f78e56764a /tools | |
| parent | tools/bootconfig: Fix tracing_on option checking in ftrace2bconf.sh (diff) | |
| download | linux-903bd067faa837fddb6e5c8b740c3374dc582f04.tar.xz linux-903bd067faa837fddb6e5c8b740c3374dc582f04.zip | |
bootconfig: Fix missing return check of xbc_node_compose_key function
The function `xbc_show_list should` handle the keys during the
composition. Even the errors returned by the compose function. Instead
of removing the `ret` variable, it should save the value and show the
exact error. This missing variable is causing a compilation issue also.
Link: https://lkml.kernel.org/r/163077087861.222577.12884543474750968146.stgit@devnote2
Fixes: e5efaeb8a8f5 ("bootconfig: Support mixing a value and subkeys under a key")
Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bootconfig/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c index f45fa992e01d..fd67496a947f 100644 --- a/tools/bootconfig/main.c +++ b/tools/bootconfig/main.c @@ -111,9 +111,11 @@ static void xbc_show_list(void) char key[XBC_KEYLEN_MAX]; struct xbc_node *leaf; const char *val; + int ret; xbc_for_each_key_value(leaf, val) { - if (xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX) < 0) { + ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX); + if (ret < 0) { fprintf(stderr, "Failed to compose key %d\n", ret); break; } |