Skip to contentSkip to conversation

ring-buffer: Fix memleak in ring_buffer_free()

PATCH In review Eric Dumazet 3 participants 5 messages Aug 7, 2009 – Aug 8, 2009

Subsystems (2)
Tracing Tracing ring buffer
lore
Share & tools
lore

Eric Dumazet

author
#0 lore raw

PATCH 1/1 ring-buffer: Fix memleak in ring_buffer_free()

I noticed oprofile memleaked in linux-2.6 current tree, and tracked this ring-buffer leak.

This is a stable candidate.

[PATCH] ring-buffer: Fix memleak in ring_buffer_free()

Signed-off-by Eric Dumazet <[email protected]>

---

kernel/trace/ring_buffer.c +1 -0
index bf27bb7..c1d874e 100644
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
 
 	put_online_cpus();
 
+	kfree(buffer->buffers);
 	free_cpumask_var(buffer->cpumask);
 
 	kfree(buffer);
maintainer
#1 lore raw
Quoted 4 lines · Eric Dumazet

I noticed oprofile memleaked in linux-2.6 current tree, and tracked this ring-buffer leak.

This is a stable candidate.

Thanks! I'll pull it in now.

-- Steve

Quoted 18 lines

[PATCH] ring-buffer: Fix memleak in ring_buffer_free()

Signed-off-by Eric Dumazet <[email protected]>

---

kernel/trace/ring_buffer.c +1 -0
index bf27bb7..c1d874e 100644
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
 
 	put_online_cpus();
 
+	kfree(buffer->buffers);
 	free_cpumask_var(buffer->cpumask);
 
 	kfree(buffer);
maintainer
#2 lore raw
In reply to Eric Dumazet

Ingo,

Please pull the latest tip/tracing/urgent tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent

Eric Dumazet (1):
ring-buffer: Fix memleak in ring_buffer_free()

----

 kernel/trace/ring_buffer.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---------------------------
commit bd3f02212d6a457267e0c9c02c426151c436d9d4
Author: Eric Dumazet <[email protected]>
Date:   Fri Aug 7 12:49:29 2009 +0200

ring-buffer: Fix memleak in ring_buffer_free()

I noticed oprofile memleaked in linux-2.6 current tree, and tracked this ring-buffer leak.

Signed-off-by Eric Dumazet <[email protected]>

LKML-Reference: <[email protected]>

Cc [email protected]
Signed-off-by Steven Rostedt <[email protected]>
kernel/trace/ring_buffer.c +1 -0
index d4d3580..a330513 100644
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
 
 	put_online_cpus();
 
+	kfree(buffer->buffers);
 	free_cpumask_var(buffer->cpumask);
 
 	kfree(buffer);
#3 lore raw
Quoted 8 lines · Steven Rostedt

Ingo,

Please pull the latest tip/tracing/urgent tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent

Quoted 6 lines

Eric Dumazet (1):
ring-buffer: Fix memleak in ring_buffer_free()

----

 kernel/trace/ring_buffer.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Pulled, thanks Steve!

Ingo

author
#4 lore raw
In reply to Eric Dumazet
Commit-ID:  bd3f02212d6a457267e0c9c02c426151c436d9d4
Gitweb:     http://git.kernel.org/tip/bd3f02212d6a457267e0c9c02c426151c436d9d4
Author:     Eric Dumazet <[email protected]>
AuthorDate: Fri, 7 Aug 2009 12:49:29 +0200
Committer:  Steven Rostedt <[email protected]>
CommitDate: Fri, 7 Aug 2009 12:46:39 -0400

ring-buffer: Fix memleak in ring_buffer_free()

I noticed oprofile memleaked in linux-2.6 current tree, and tracked this ring-buffer leak.

Signed-off-by Eric Dumazet <[email protected]>

LKML-Reference: <[email protected]>

Cc [email protected]
Signed-off-by Steven Rostedt <[email protected]>
---
 kernel/trace/ring_buffer.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/trace/ring_buffer.c +1 -0
index d4d3580..a330513 100644
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
 
 	put_online_cpus();
 
+	kfree(buffer->buffers);
 	free_cpumask_var(buffer->cpumask);
 
 	kfree(buffer);