* [PATCH] ring-buffer: Fix memleak in ring_buffer_free()
@ 2009-08-07 10:49 Eric Dumazet
2009-08-07 15:15 ` Steven Rostedt
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Eric Dumazet @ 2009-08-07 10:49 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux kernel, stable
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 <eric.dumazet@gmail.com>
---
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index bf27bb7..c1d874e 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
put_online_cpus();
+ kfree(buffer->buffers);
free_cpumask_var(buffer->cpumask);
kfree(buffer);
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ring-buffer: Fix memleak in ring_buffer_free()
2009-08-07 10:49 [PATCH] ring-buffer: Fix memleak in ring_buffer_free() Eric Dumazet
@ 2009-08-07 15:15 ` Steven Rostedt
2009-08-07 17:36 ` [GIT PULL] " Steven Rostedt
2009-08-08 14:57 ` [tip:tracing/urgent] " tip-bot for Eric Dumazet
2 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2009-08-07 15:15 UTC (permalink / raw)
To: Eric Dumazet; +Cc: linux kernel, stable
On Fri, 7 Aug 2009, Eric Dumazet wrote:
> 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
>
> [PATCH] ring-buffer: Fix memleak in ring_buffer_free()
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index bf27bb7..c1d874e 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
>
> put_online_cpus();
>
> + kfree(buffer->buffers);
> free_cpumask_var(buffer->cpumask);
>
> kfree(buffer);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] ring-buffer: Fix memleak in ring_buffer_free()
2009-08-07 10:49 [PATCH] ring-buffer: Fix memleak in ring_buffer_free() Eric Dumazet
2009-08-07 15:15 ` Steven Rostedt
@ 2009-08-07 17:36 ` Steven Rostedt
2009-08-08 14:53 ` Ingo Molnar
2009-08-08 14:57 ` [tip:tracing/urgent] " tip-bot for Eric Dumazet
2 siblings, 1 reply; 5+ messages in thread
From: Steven Rostedt @ 2009-08-07 17:36 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Eric Dumazet, linux kernel, stable
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 <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
LKML-Reference: <4A7C06B9.2090302@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index d4d3580..a330513 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
put_online_cpus();
+ kfree(buffer->buffers);
free_cpumask_var(buffer->cpumask);
kfree(buffer);
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [GIT PULL] ring-buffer: Fix memleak in ring_buffer_free()
2009-08-07 17:36 ` [GIT PULL] " Steven Rostedt
@ 2009-08-08 14:53 ` Ingo Molnar
0 siblings, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2009-08-08 14:53 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Eric Dumazet, linux kernel, stable
* Steven Rostedt <rostedt@goodmis.org> wrote:
> 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(-)
Pulled, thanks Steve!
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:tracing/urgent] ring-buffer: Fix memleak in ring_buffer_free()
2009-08-07 10:49 [PATCH] ring-buffer: Fix memleak in ring_buffer_free() Eric Dumazet
2009-08-07 15:15 ` Steven Rostedt
2009-08-07 17:36 ` [GIT PULL] " Steven Rostedt
@ 2009-08-08 14:57 ` tip-bot for Eric Dumazet
2 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Eric Dumazet @ 2009-08-08 14:57 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, eric.dumazet, rostedt, tglx
Commit-ID: bd3f02212d6a457267e0c9c02c426151c436d9d4
Gitweb: http://git.kernel.org/tip/bd3f02212d6a457267e0c9c02c426151c436d9d4
Author: Eric Dumazet <eric.dumazet@gmail.com>
AuthorDate: Fri, 7 Aug 2009 12:49:29 +0200
Committer: Steven Rostedt <rostedt@goodmis.org>
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 <eric.dumazet@gmail.com>
LKML-Reference: <4A7C06B9.2090302@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/ring_buffer.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index d4d3580..a330513 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer)
put_online_cpus();
+ kfree(buffer->buffers);
free_cpumask_var(buffer->cpumask);
kfree(buffer);
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-08-08 14:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-07 10:49 [PATCH] ring-buffer: Fix memleak in ring_buffer_free() Eric Dumazet
2009-08-07 15:15 ` Steven Rostedt
2009-08-07 17:36 ` [GIT PULL] " Steven Rostedt
2009-08-08 14:53 ` Ingo Molnar
2009-08-08 14:57 ` [tip:tracing/urgent] " tip-bot for Eric Dumazet
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.