From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753000AbdEILEt (ORCPT ); Tue, 9 May 2017 07:04:49 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33892 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576AbdEILEq (ORCPT ); Tue, 9 May 2017 07:04:46 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim Subject: [PATCH v3 1/7] perf config: Handle errors from {show_spec, set}_config() in the loop Date: Tue, 9 May 2017 20:04:38 +0900 Message-Id: <1494327878-25060-1-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org show_spec_config() and set_config() can be called multiple times in the loop in cmd_config(). However, the return values from them did not checked. Even though one of the return values means a error (i.e. -1), it can be just skipped. It is a bug, so fix it. Check each return value from show_spec_config() and set_config() in the loop in cmd_config() and if the return value means a error, handle it. Cc: Jiri Olsa Cc: Namhyung Kim Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Taeung Song --- tools/perf/builtin-config.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 7545966..bb1be79 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -225,10 +225,23 @@ int cmd_config(int argc, const char **argv) break; } - if (value == NULL) + if (value == NULL) { ret = show_spec_config(set, var); - else + if (ret < 0) { + pr_err("%s is not configured: %s\n", + var, config_filename); + free(arg); + break; + } + } else { ret = set_config(set, config_filename, var, value); + if (ret < 0) { + pr_err("Failed to set '%s=%s' on %s\n", + var, value, config_filename); + free(arg); + break; + } + } free(arg); } } -- 2.7.4