oprofile: fix uninitialized use of struct op_entry
PATCH 1/1 oprofile: fix uninitialized use of struct op_entry
In case of losing samples struct op_entry could have been used uninitialized causing e.g. a wrong preemtion count or NULL pointer access. This patch fixes this.
Signed-off-by Robert Richter <[email protected]>
--- drivers/oprofile/cpu_buffer.c | 5 +++++ drivers/oprofile/cpu_buffer.h | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
drivers/oprofile/cpu_buffer.c +5 -0
@@ -393,16 +393,21 @@ oprofile_write_reserve(struct op_entry *entry, struct pt_regs * const regs,return ; fail: + entry->event =NULL ; cpu_buf->sample_lost_overflow++; }int oprofile_add_data (struct op_entry *entry,unsigned long val) { +if (!entry->event) +return 0 ;return op_cpu_buffer_add_data (entry, val); }int oprofile_write_commit (struct op_entry *entry) { +if (!entry->event) +return -EINVAL ;return op_cpu_buffer_write_commit (entry); }
drivers/oprofile/cpu_buffer.h +7 -0
@@ -66,6 +66,13 @@ static inline void op_cpu_buffer_reset(int cpu) 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 *op_cpu_buffer_write_reserve (struct op_entry *entry,unsigned long size);int op_cpu_buffer_write_commit (struct op_entry *entry);
Signature · 1 line
1.6.1
Ingo Molnar
AppliedQuoted 9 lines · Robert Richter
In case of losing samples struct
op_entrycould have been used uninitialized causing e.g. a wrong preemtion count or NULL pointer access. This patch fixes this.Signed-off-by Robert Richter <[email protected]>--- drivers/oprofile/cpu_buffer.c | 5 +++++ drivers/oprofile/cpu_buffer.h | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
applied to tip/core/urgent, thanks Robert!
Ingo