Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 1 Oct 2020 14:27:23 +0900
From:   Masami Hiramatsu <mhiramat@kernel.org>
To:     Tom Zanussi <zanussi@kernel.org>
Cc:     rostedt@goodmis.org, axelrasmussen@google.com, mhiramat@kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/3] tracing: Fix parse_synth_field() error handling
Message-Id: <20201001142723.66b8f3d7d6f7df803044c567@kernel.org>
In-Reply-To: <15b1808e1466f378fcf206e61b57c802423f8319.1601490263.git.zanussi@kernel.org>
References: <cover.1601490263.git.zanussi@kernel.org>
        <15b1808e1466f378fcf206e61b57c802423f8319.1601490263.git.zanussi@kernel.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Tom,

On Wed, 30 Sep 2020 13:40:51 -0500
Tom Zanussi <zanussi@kernel.org> wrote:

> synth_field_size() returns either a positive size or an error (zero or
> a negative value). However, the existing code assumes the only error
> value is 0. It doesn't handle negative error codes, as it assigns
> directly to field->size (a size_t; unsigned), thereby interpreting the
> error code as a valid size instead.
> 
> Do the test before assignment to field->size.

This looks good to me. And I guess it is a kind of bugfix which should be backported?
(doesn't this need a Fixes tag?)

Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you,

> 
> [ axelrasmussen@google.com: changelog addition, first paragraph above ]
> 
> Signed-off-by: Tom Zanussi <zanussi@kernel.org>
> ---
>  kernel/trace/trace_events_synth.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
> index a9cd7793f7ea..fa8a99828f41 100644
> --- a/kernel/trace/trace_events_synth.c
> +++ b/kernel/trace/trace_events_synth.c
> @@ -465,6 +465,7 @@ static struct synth_field *parse_synth_field(int argc, const char **argv,
>  	struct synth_field *field;
>  	const char *prefix = NULL, *field_type = argv[0], *field_name, *array;
>  	int len, ret = 0;
> +	ssize_t size;
>  
>  	if (field_type[0] == ';')
>  		field_type++;
> @@ -520,11 +521,12 @@ static struct synth_field *parse_synth_field(int argc, const char **argv,
>  			field->type[len - 1] = '\0';
>  	}
>  
> -	field->size = synth_field_size(field->type);
> -	if (!field->size) {
> +	size = synth_field_size(field->type);
> +	if (size <= 0) {
>  		ret = -EINVAL;
>  		goto free;
>  	}
> +	field->size = size;
>  
>  	if (synth_field_is_string(field->type))
>  		field->is_string = true;
> -- 
> 2.17.1
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>