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

Commit 0ac2058f authored by Li Zefan's avatar Li Zefan Committed by Steven Rostedt
Browse files

tracing/filters: strloc should be unsigned short 



I forgot to update filter code accordingly in
"tracing/events: change the type of __str_loc_item to unsigned short"
(commt b0aae68c)

It can cause system crash:

 # echo 1 > tracing/events/irq/irq_handler_entry/enable
 # echo 'name == eth0' > tracing/events/irq/irq_handler_entry/filter

[ Impact: fix crash while filtering on __string() field ]

Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4A35B905.3090500@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 5e4904cb

kernel/trace/trace_events_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int filter_pred_string(struct filter_pred *pred, void *event, 
static int filter_pred_strloc(struct filter_pred *pred, void *event,

			      int val1, int val2)

{

	int str_loc = *(int *)(event + pred->offset);

	unsigned short str_loc = *(unsigned short *)(event + pred->offset);

	char *addr = (char *)(event + str_loc);

	int cmp, match;