Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 396f29ea authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Greg Kroah-Hartman
Browse files

tracing: Reject string operand in the histogram expression 

commit a9d10ca4986571bffc19778742d508cc8dd13e02 upstream.

Since the string type can not be the target of the addition / subtraction
operation, it must be rejected. Without this fix, the string type silently
converted to digits.

Link: https://lkml.kernel.org/r/162742654278.290973.1523000673366456634.stgit@devnote2



Cc: stable@vger.kernel.org
Fixes: 100719dc ("tracing: Add simple expression support to hist triggers")
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28276c28

kernel/trace/trace_events_hist.c

+19 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ 
	C(INVALID_SUBSYS_EVENT,	"Invalid subsystem or event name"),	\

	C(INVALID_REF_KEY,	"Using variable references in keys not supported"), \

	C(VAR_NOT_FOUND,	"Couldn't find variable"),		\

	C(FIELD_NOT_FOUND,	"Couldn't find field"),

	C(FIELD_NOT_FOUND,	"Couldn't find field"),			\

	C(INVALID_STR_OPERAND,	"String type can not be an operand in expression"),



#undef C

#define C(a, b)		HIST_ERR_##a
@@ -3038,6 +3039,13 @@ static struct hist_field *parse_unary(struct hist_trigger_data *hist_data, 
		ret = PTR_ERR(operand1);

		goto free;

	}

	if (operand1->flags & HIST_FIELD_FL_STRING) {

		/* String type can not be the operand of unary operator. */

		hist_err(file->tr, HIST_ERR_INVALID_STR_OPERAND, errpos(str));

		destroy_hist_field(operand1, 0);

		ret = -EINVAL;

		goto free;

	}



	expr->flags |= operand1->flags &

		(HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
@@ -3139,6 +3147,11 @@ static struct hist_field *parse_expr(struct hist_trigger_data *hist_data, 
		operand1 = NULL;

		goto free;

	}

	if (operand1->flags & HIST_FIELD_FL_STRING) {

		hist_err(file->tr, HIST_ERR_INVALID_STR_OPERAND, errpos(operand1_str));

		ret = -EINVAL;

		goto free;

	}



	/* rest of string could be another expression e.g. b+c in a+b+c */

	operand_flags = 0;
@@ -3148,6 +3161,11 @@ static struct hist_field *parse_expr(struct hist_trigger_data *hist_data, 
		operand2 = NULL;

		goto free;

	}

	if (operand2->flags & HIST_FIELD_FL_STRING) {

		hist_err(file->tr, HIST_ERR_INVALID_STR_OPERAND, errpos(str));

		ret = -EINVAL;

		goto free;

	}



	ret = check_expr_operands(file->tr, operand1, operand2);

	if (ret)