Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1668156 > unrolled thread

[PATCH v4 1/5] perf config: Check error cases of {show_spec, set}_config()

Back to article view | Back to linux.kernel

Contents

  [PATCH v4 1/5] perf config: Check error cases of {show_spec, set}_config() Taeung Song <treeze.taeung@gmail.com> - 2017-06-17 05:50 +0200
    Re: [PATCH v4 1/5] perf config: Check error cases of {show_spec,  set}_config() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-19 20:40 +0200

#1668156 — [PATCH v4 1/5] perf config: Check error cases of {show_spec, set}_config()

show_spec_config() and set_config() can be called multiple times
in the loop in cmd_config().
However, The error cases of them wasn't checked, so fix it.

Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 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

[toc] | [next] | [standalone]

#1669580 — Re: [PATCH v4 1/5] perf config: Check error cases of {show_spec, set}_config()

Em Sat, Jun 17, 2017 at 12:46:37PM +0900, Taeung Song escreveu:
> show_spec_config() and set_config() can be called multiple times
> in the loop in cmd_config().
> However, The error cases of them wasn't checked, so fix it.

Thanks, applied.
 
> Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> ---
>  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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web