adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

oprofile: fix uninitialized use of struct op_entry

Browse source 
Impact: fix crash

In case of losing samples struct op_entry could have been used
uninitialized causing e.g. a wrong preemption count or NULL pointer
access. This patch fixes this.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Robert Richter 2009-01-17 17:13:27 +01:00 committed by Ingo Molnar
parent c903ff8379
commit fdb6a8f4db
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/oprofile/cpu_buffer.c
View file

@ -393,16 +393,21 @@ oprofile_write_reserve(struct op_entry *entry, struct pt_regs * const regs,
return; return;
fail: fail:
entry->event = NULL;
cpu_buf->sample_lost_overflow++; cpu_buf->sample_lost_overflow++;
} }
int oprofile_add_data(struct op_entry *entry, unsigned long val) int oprofile_add_data(struct op_entry *entry, unsigned long val)
{ {
if (!entry->event)
return 0;
return op_cpu_buffer_add_data(entry, val); return op_cpu_buffer_add_data(entry, val);
} }
int oprofile_write_commit(struct op_entry *entry) int oprofile_write_commit(struct op_entry *entry)
{ {
if (!entry->event)
return -EINVAL;
return op_cpu_buffer_write_commit(entry); return op_cpu_buffer_write_commit(entry);
} }

7
drivers/oprofile/cpu_buffer.h
View file

@ -66,6 +66,13 @@ static inline void op_cpu_buffer_reset(int cpu)
cpu_buf->last_task = NULL; cpu_buf->last_task = NULL;
} }
/*
* op_cpu_buffer_add_data() and op_cpu_buffer_write_commit() may be
* called only if op_cpu_buffer_write_reserve() did not return NULL or
* entry->event != NULL, otherwise entry->size or entry->event will be
* used uninitialized.
*/
struct op_sample struct op_sample
*op_cpu_buffer_write_reserve(struct op_entry *entry, unsigned long size); *op_cpu_buffer_write_reserve(struct op_entry *entry, unsigned long size);
int op_cpu_buffer_write_commit(struct op_entry *entry); int op_cpu_buffer_write_commit(struct op_entry *entry);