From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98546C433F5 for ; Sat, 4 Sep 2021 15:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BF5260E76 for ; Sat, 4 Sep 2021 15:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237054AbhIDPzo (ORCPT ); Sat, 4 Sep 2021 11:55:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:41472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237039AbhIDPzm (ORCPT ); Sat, 4 Sep 2021 11:55:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F20860F56; Sat, 4 Sep 2021 15:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630770880; bh=dFP4F2MCVFcTXj1Gv7k1QTi8zTvPmHvCY0jx3Djs5f8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lFYwcM3wzkPdefVLlM13/YW5AKb8psf5CprGxwrOgXJHXhvgeZifcmd/gKiObahmL BmZ03C7Mw+7Aj952M0gRBzADKUKaZ0nBn6UVmaLVnsOzi965FvbX2cjUnaRzqkTvtS M5hXKXLX8nw+0umWJ8KeukyRk1xAfbEHS8M5wh/9BdFxsFYK6xQSc+La4qVJsZdcvD xIrM6EBWKS1JSan7c1nOKOMeF8zk9KcOTXOp05WmSEez7Zyl+bqJgJdMBznmnj4XB/ Mcz9cgEjBbN4aqrHcfITld3lFup7BCKxYvzmykBBUIAc1ob8cdSMAhS3SfmqBA006L J4rWCBtffryHQ== From: Masami Hiramatsu To: Steven Rostedt Cc: Masami Hiramatsu , LKML , Julio Faracco , stable@vgar.kernel.org Subject: [PATCH v3 5/6] bootconfig: Fix missing return check of xbc_node_compose_key function Date: Sun, 5 Sep 2021 00:54:38 +0900 Message-Id: <163077087861.222577.12884543474750968146.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <163077084169.222577.4459698040375322439.stgit@devnote2> References: <163077084169.222577.4459698040375322439.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julio Faracco 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. Fixes: e5efaeb8a8f5 ("bootconfig: Support mixing a value and subkeys under a key") Signed-off-by: Julio Faracco Acked-by: Masami Hiramatsu Cc: stable@vgar.kernel.org --- tools/bootconfig/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; }