* [PATCH 1/2] tracing/filters: strloc should be unsigned short
@ 2009-05-29 8:41 Li Zefan
2009-05-29 13:28 ` Frédéric Weisbecker
0 siblings, 1 reply; 2+ messages in thread
From: Li Zefan @ 2009-05-29 8:41 UTC (permalink / raw)
To: Steven Rostedt, Frederic Weisbecker; +Cc: Ingo Molnar, Tom Zanussi, LKML
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' > /mnt/tracing/events/irq/irq_handler_entry/filter
[ Impact: fix system crash while filtering on __string() field ]
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace_events_filter.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index a7430b1..a854eed 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,
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;
--
1.5.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/2] tracing/filters: strloc should be unsigned short
2009-05-29 8:41 [PATCH 1/2] tracing/filters: strloc should be unsigned short Li Zefan
@ 2009-05-29 13:28 ` Frédéric Weisbecker
0 siblings, 0 replies; 2+ messages in thread
From: Frédéric Weisbecker @ 2009-05-29 13:28 UTC (permalink / raw)
To: Li Zefan; +Cc: Steven Rostedt, Ingo Molnar, Tom Zanussi, LKML
2009/5/29 Li Zefan <lizf@cn.fujitsu.com>:
> 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' > /mnt/tracing/events/irq/irq_handler_entry/filter
>
> [ Impact: fix system crash while filtering on __string() field ]
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
> kernel/trace/trace_events_filter.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
> index a7430b1..a854eed 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,
> 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);
Ouch, indeed :-)
I will apply this one and send it to Ingo, thanks!
> char *addr = (char *)(event + str_loc);
> int cmp, match;
>
> --
> 1.5.4.rc3
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-29 13:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-29 8:41 [PATCH 1/2] tracing/filters: strloc should be unsigned short Li Zefan
2009-05-29 13:28 ` Frédéric Weisbecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox