aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-06-14 22:59:17 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-06-15 11:37:18 -0400
commit0ac2058f686a19fe8ab25c4f3104fc1580dce7cf (patch)
treeecc0aa6f26b5479e833c96d2f6263a30ebd80045 /kernel
parent5e4904cb633177046bee5d26946a7ac918e642fc (diff)
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 b0aae68cc5508f3c2fbf728988c954db4c8b8a53) 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: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> LKML-Reference: <4A35B905.3090500@cn.fujitsu.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_events_filter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 1d8192304842..b24ab0e6ea74 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -178,7 +178,7 @@ static int filter_pred_string(struct filter_pred *pred, void *event,
178static int filter_pred_strloc(struct filter_pred *pred, void *event, 178static int filter_pred_strloc(struct filter_pred *pred, void *event,
179 int val1, int val2) 179 int val1, int val2)
180{ 180{
181 int str_loc = *(int *)(event + pred->offset); 181 unsigned short str_loc = *(unsigned short *)(event + pred->offset);
182 char *addr = (char *)(event + str_loc); 182 char *addr = (char *)(event + str_loc);
183 int cmp, match; 183 int cmp, match;
184 184