Commit ee9397a6 authored by Ben Hutchings's avatar Ben Hutchings Committed by Ingo Molnar

perf: Fix double-free of the AUX buffer

If rb->aux_refcount is decremented to zero before rb->refcount,
__rb_free_aux() may be called twice resulting in a double free of
rb->aux_pages.  Fix this by adding a check to __rb_free_aux().
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Fixes: 57ffc5ca ("perf: Fix AUX buffer refcounting")
Link: http://lkml.kernel.org/r/1437953468.12842.17.camel@decadent.org.ukSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fed66e2c
...@@ -559,11 +559,13 @@ static void __rb_free_aux(struct ring_buffer *rb) ...@@ -559,11 +559,13 @@ static void __rb_free_aux(struct ring_buffer *rb)
rb->aux_priv = NULL; rb->aux_priv = NULL;
} }
for (pg = 0; pg < rb->aux_nr_pages; pg++) if (rb->aux_nr_pages) {
rb_free_aux_page(rb, pg); for (pg = 0; pg < rb->aux_nr_pages; pg++)
rb_free_aux_page(rb, pg);
kfree(rb->aux_pages); kfree(rb->aux_pages);
rb->aux_nr_pages = 0; rb->aux_nr_pages = 0;
}
} }
void rb_free_aux(struct ring_buffer *rb) void rb_free_aux(struct ring_buffer *rb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment