perf: Avoid double-free of AUX buffer
PATCH 1/1 perf: Avoid double-free of 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().
Fixes 57ffc5ca679f ("perf: Fix AUX buffer refcounting")
Signed-off-by Ben Hutchings <[email protected]>
---
Found by inspection, and the fix is compile-tested only.
I think both commit 57ffc5ca679f and this should go to stable, but that's up to you.
Ben.
kernel/events/ring_buffer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/events/ring_buffer.c +6 -4
@@ -559,11 +559,13 @@ static void __rb_free_aux(struct ring_buffer *rb) rb->aux_priv =NULL ; } -for (pg =0 ; pg < rb->aux_nr_pages; pg++) -rb_free_aux_page (rb, pg); +if (rb->aux_nr_pages) { +for (pg =0 ; pg < rb->aux_nr_pages; pg++) +rb_free_aux_page (rb, pg); -kfree (rb->aux_pages); - rb->aux_nr_pages =0 ; +kfree (rb->aux_pages); + rb->aux_nr_pages =0 ; + } }void rb_free_aux (struct ring_buffer *rb)
Signature · 2 lines
Ben Hutchings Any sufficiently advanced bug is indistinguishable from a feature.
tip-bot for Ben Hutchings
merge bot[tip:perf/core] perf: Fix double-free of the AUX buffer
perf: Fix double-free of the AUX buffer
Commit-ID: ee9397a6fb9bc4e52677f5e33eed4abee0f515e6 Gitweb: http://git.kernel.org/tip/ee9397a6fb9bc4e52677f5e33eed4abee0f515e6 Author: Ben Hutchings <[email protected]> AuthorDate: Mon, 27 Jul 2015 00:31:08 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 12 Aug 2015 11:37:21 +0200
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 Ben Hutchings <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Fixes 57ffc5ca679f ("perf: Fix AUX buffer refcounting")
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/events/ring_buffer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/events/ring_buffer.c +6 -4
@@ -559,11 +559,13 @@ static void __rb_free_aux(struct ring_buffer *rb) rb->aux_priv =NULL ; } -for (pg =0 ; pg < rb->aux_nr_pages; pg++) -rb_free_aux_page (rb, pg); +if (rb->aux_nr_pages) { +for (pg =0 ; pg < rb->aux_nr_pages; pg++) +rb_free_aux_page (rb, pg); -kfree (rb->aux_pages); - rb->aux_nr_pages =0 ; +kfree (rb->aux_pages); + rb->aux_nr_pages =0 ; + } }void rb_free_aux (struct ring_buffer *rb)