diff options
author | Philippe Elie <phil.el@wanadoo.fr> | 2007-11-14 19:58:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:37 -0500 |
commit | df9d177aa28d50e64bae6fbd6b263833079e3571 (patch) | |
tree | b265158232a39d9d45cac0a97d5fdc17e7ca237d /drivers/oprofile/cpu_buffer.c | |
parent | 03ad369ac900116f35da7505f768ebbd481d09a4 (diff) |
oProfile: oops when profile_pc() returns ~0LU
Instruction pointer returned by profile_pc() can be a random value. This
break the assumption than we can safely set struct op_sample.eip field to a
magic value to signal to the per-cpu buffer reader side special event like
task switch ending up in a segfault in get_task_mm() when profile_pc()
return ~0UL. Fixed by sanitizing the sampled eip and reject/log invalid
eip.
Problem reported by Sami Farin, patch tested by him.
Signed-off-by: Philippe Elie <phil.el@wanadoo.fr>
Tested-by: Sami Farin <safari-kernel@safari.iki.fi>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
-rw-r--r-- | drivers/oprofile/cpu_buffer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index a83c3db7d18f..c93d3d2640ab 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
@@ -64,6 +64,8 @@ int alloc_cpu_buffers(void) | |||
64 | b->head_pos = 0; | 64 | b->head_pos = 0; |
65 | b->sample_received = 0; | 65 | b->sample_received = 0; |
66 | b->sample_lost_overflow = 0; | 66 | b->sample_lost_overflow = 0; |
67 | b->backtrace_aborted = 0; | ||
68 | b->sample_invalid_eip = 0; | ||
67 | b->cpu = i; | 69 | b->cpu = i; |
68 | INIT_DELAYED_WORK(&b->work, wq_sync_buffer); | 70 | INIT_DELAYED_WORK(&b->work, wq_sync_buffer); |
69 | } | 71 | } |
@@ -175,6 +177,11 @@ static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc, | |||
175 | 177 | ||
176 | cpu_buf->sample_received++; | 178 | cpu_buf->sample_received++; |
177 | 179 | ||
180 | if (pc == ESCAPE_CODE) { | ||
181 | cpu_buf->sample_invalid_eip++; | ||
182 | return 0; | ||
183 | } | ||
184 | |||
178 | if (nr_available_slots(cpu_buf) < 3) { | 185 | if (nr_available_slots(cpu_buf) < 3) { |
179 | cpu_buf->sample_lost_overflow++; | 186 | cpu_buf->sample_lost_overflow++; |
180 | return 0; | 187 | return 0; |