[PATCH] [perf] Remove the node from rblist in strlist__remove

[PATCH] [perf] Remove the node from rblist in strlist__remove

[Suzuki K. Poulose]

The following commit:

author	David Ahern <dsahern@gmail.com>
	Tue, 31 Jul 2012 04:31:33 +0000 (22:31 -0600)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Fri, 3 Aug 2012 13:39:51 +0000 (10:39 -0300)
commit	ee8dd3ca43f151d9fbe1edeef68fb8a77eb9f047

causes a double free during a probe deletion as the node is
never removed from the list via strlist__remove(), even though
it gets 'deleted' (read free()'d). This causes a double
free when we do strlist__delete() as the node is already deleted
but present in the rblist.

[suzukikp@suzukikp perf]$ sudo ./perf probe -a do_fork
Added new event:
  probe:do_fork        (on do_fork)

You can now use it in all perf tools, such as:

	perf record -e probe:do_fork -aR sleep 1

[suzukikp@suzukikp perf]$ sudo ./perf probe -d do_fork
Removed event: probe:do_fork
*** glibc detected *** ./perf: double free or corruption (fasttop): 0x000000000133d600 ***
======= Backtrace: =========
/lib64/libc.so.6[0x38eec7dda6]
./perf(rblist__delete+0x5c)[0x47d3dc]
./perf(del_perf_probe_events+0xb6)[0x47b826]
./perf(cmd_probe+0x471)[0x42c8d1]
./perf[0x4150b3]
./perf(main+0x501)[0x4148e1]
/lib64/libc.so.6(__libc_start_main+0xed)[0x38eec2169d]
./perf[0x414a61]


Make sure we remove the node from the rblist before we delete the
node. The rblist__remove_node() will invoke rblist->node_delete,
which  will take care of deleting the node with the suitable function
provided by the user.

Reported-by: Ananth N. Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
---

 tools/perf/util/strlist.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
index 95856ff..155d8b7 100644
--- a/tools/perf/util/strlist.c
+++ b/tools/perf/util/strlist.c
@@ -93,7 +93,7 @@ out:
 
 void strlist__remove(struct strlist *slist, struct str_node *snode)
 {
-	str_node__delete(snode, slist->dupstr);
+	rblist__remove_node(&slist->rblist, &snode->rb_node);
 }
 
 struct str_node *strlist__find(struct strlist *slist, const char *entry)

Re: [PATCH] [perf] Remove the node from rblist in strlist__remove

[David Ahern]

On 8/29/12 12:00 AM, Suzuki K. Poulose wrote:
> The following commit:
>
> author	David Ahern <dsahern@gmail.com>
> 	Tue, 31 Jul 2012 04:31:33 +0000 (22:31 -0600)
> committer	Arnaldo Carvalho de Melo <acme@redhat.com>
> 	Fri, 3 Aug 2012 13:39:51 +0000 (10:39 -0300)
> commit	ee8dd3ca43f151d9fbe1edeef68fb8a77eb9f047
>
> causes a double free during a probe deletion as the node is
> never removed from the list via strlist__remove(), even though
> it gets 'deleted' (read free()'d). This causes a double
> free when we do strlist__delete() as the node is already deleted
> but present in the rblist.
>
> [suzukikp@suzukikp perf]$ sudo ./perf probe -a do_fork
> Added new event:
>    probe:do_fork        (on do_fork)
>
> You can now use it in all perf tools, such as:
>
> 	perf record -e probe:do_fork -aR sleep 1
>
> [suzukikp@suzukikp perf]$ sudo ./perf probe -d do_fork
> Removed event: probe:do_fork
> *** glibc detected *** ./perf: double free or corruption (fasttop): 0x000000000133d600 ***
> ======= Backtrace: =========
> /lib64/libc.so.6[0x38eec7dda6]
> ./perf(rblist__delete+0x5c)[0x47d3dc]
> ./perf(del_perf_probe_events+0xb6)[0x47b826]
> ./perf(cmd_probe+0x471)[0x42c8d1]
> ./perf[0x4150b3]
> ./perf(main+0x501)[0x4148e1]
> /lib64/libc.so.6(__libc_start_main+0xed)[0x38eec2169d]
> ./perf[0x414a61]
>
>
> Make sure we remove the node from the rblist before we delete the
> node. The rblist__remove_node() will invoke rblist->node_delete,
> which  will take care of deleting the node with the suitable function
> provided by the user.
>
> Reported-by: Ananth N. Mavinakayanahalli <ananth@in.ibm.com>
> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Arnaldo Carvalho de Melo <acme@infradead.org>

Acked-by: David Ahern <dsahern@gmail.com>

Same type of change is needed for util/intlist.c if you want to submit 
one, otherwise I will take care of it.

David

Re: [PATCH] [perf] Remove the node from rblist in strlist__remove

[Suzuki K. Poulose]

On 08/29/2012 11:59 AM, David Ahern wrote:
> On 8/29/12 12:00 AM, Suzuki K. Poulose wrote:
>> The following commit:
>>
>> author    David Ahern <dsahern@gmail.com>
>>     Tue, 31 Jul 2012 04:31:33 +0000 (22:31 -0600)
>> committer    Arnaldo Carvalho de Melo <acme@redhat.com>
>>     Fri, 3 Aug 2012 13:39:51 +0000 (10:39 -0300)
>> commit    ee8dd3ca43f151d9fbe1edeef68fb8a77eb9f047
>>
>> causes a double free during a probe deletion as the node is
>> never removed from the list via strlist__remove(), even though
>> it gets 'deleted' (read free()'d). This causes a double
>> free when we do strlist__delete() as the node is already deleted
>> but present in the rblist.
>>
>> [suzukikp@suzukikp perf]$ sudo ./perf probe -a do_fork
>> Added new event:
>>    probe:do_fork        (on do_fork)
>>
>> You can now use it in all perf tools, such as:
>>
>>     perf record -e probe:do_fork -aR sleep 1
>>
>> [suzukikp@suzukikp perf]$ sudo ./perf probe -d do_fork
>> Removed event: probe:do_fork
>> *** glibc detected *** ./perf: double free or corruption (fasttop):
>> 0x000000000133d600 ***
>> ======= Backtrace: =========
>> /lib64/libc.so.6[0x38eec7dda6]
>> ./perf(rblist__delete+0x5c)[0x47d3dc]
>> ./perf(del_perf_probe_events+0xb6)[0x47b826]
>> ./perf(cmd_probe+0x471)[0x42c8d1]
>> ./perf[0x4150b3]
>> ./perf(main+0x501)[0x4148e1]
>> /lib64/libc.so.6(__libc_start_main+0xed)[0x38eec2169d]
>> ./perf[0x414a61]
>>
>>
>> Make sure we remove the node from the rblist before we delete the
>> node. The rblist__remove_node() will invoke rblist->node_delete,
>> which  will take care of deleting the node with the suitable function
>> provided by the user.
>>
>> Reported-by: Ananth N. Mavinakayanahalli <ananth@in.ibm.com>
>> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
>> Cc: David Ahern <dsahern@gmail.com>
>> Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
>
> Acked-by: David Ahern <dsahern@gmail.com>
>
> Same type of change is needed for util/intlist.c if you want to submit
> one, otherwise I will take care of it.

I can send it.

Thanks
Suzuki

[PATCH] [perf] Fix intlist node removal

[Suzuki K. Poulose]

Similar to the one in :
	https://lkml.org/lkml/2012/8/29/27


Make sure we remove the node from the rblist before we delete the
node. The rblist__remove_node() will invoke rblist->node_delete,
which  will take care of deleting the node with the suitable function
provided by the user.

Signed-off-by: Suzuki K Poulose <suzuki@in.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
---

 tools/perf/util/intlist.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c
index fd530dc..77c504f 100644
--- a/tools/perf/util/intlist.c
+++ b/tools/perf/util/intlist.c
@@ -52,9 +52,9 @@ int intlist__add(struct intlist *ilist, int i)
 	return rblist__add_node(&ilist->rblist, (void *)((long)i));
 }
 
-void intlist__remove(struct intlist *ilist __used, struct int_node *node)
+void intlist__remove(struct intlist *ilist, struct int_node *node)
 {
-	int_node__delete(node);
+	rblist__remove_node(&ilist->rblist, &node->rb_node);
 }
 
 struct int_node *intlist__find(struct intlist *ilist, int i)

Re: [PATCH] [perf] Fix intlist node removal

[David Ahern]

On 8/31/12 12:58 AM, Suzuki K. Poulose wrote:
> Similar to the one in :
> 	https://lkml.org/lkml/2012/8/29/27
>
>
> Make sure we remove the node from the rblist before we delete the
> node. The rblist__remove_node() will invoke rblist->node_delete,
> which  will take care of deleting the node with the suitable function
> provided by the user.
>
> Signed-off-by: Suzuki K Poulose <suzuki@in.ibm.com>
> Cc: David Ahern <dsahern@gmail.com>
> ---
>
>   tools/perf/util/intlist.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c
> index fd530dc..77c504f 100644
> --- a/tools/perf/util/intlist.c
> +++ b/tools/perf/util/intlist.c
> @@ -52,9 +52,9 @@ int intlist__add(struct intlist *ilist, int i)
>   	return rblist__add_node(&ilist->rblist, (void *)((long)i));
>   }
>
> -void intlist__remove(struct intlist *ilist __used, struct int_node *node)
> +void intlist__remove(struct intlist *ilist, struct int_node *node)
>   {
> -	int_node__delete(node);
> +	rblist__remove_node(&ilist->rblist, &node->rb_node);
>   }
>
>   struct int_node *intlist__find(struct intlist *ilist, int i)
>

Acked-by: David Ahern <dsahern@gmail.com>

[tip:perf/core] perf tools: Fix intlist node removal

[tip-bot for Suzuki K. Poulose]

Commit-ID:  60ebf328762914b80d3e4e5f07bda599043c8eda
Gitweb:     http://git.kernel.org/tip/60ebf328762914b80d3e4e5f07bda599043c8eda
Author:     Suzuki K. Poulose <suzuki@in.ibm.com>
AuthorDate: Fri, 31 Aug 2012 12:28:47 +0530
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 5 Sep 2012 17:35:24 -0300

perf tools: Fix intlist node removal

Similar to the one in :
	https://lkml.org/lkml/2012/8/29/27

Make sure we remove the node from the rblist before we delete the node.
The rblist__remove_node() will invoke rblist->node_delete, which  will
take care of deleting the node with the suitable function provided by
the user.

Signed-off-by: Suzuki K Poulose <suzuki@in.ibm.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Suzuki K Poulose <suzuki@in.ibm.com>
Link: http://lkml.kernel.org/r/20120831065840.5167.90318.stgit@suzukikp.in.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/intlist.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c
index fd530dc..77c504f 100644
--- a/tools/perf/util/intlist.c
+++ b/tools/perf/util/intlist.c
@@ -52,9 +52,9 @@ int intlist__add(struct intlist *ilist, int i)
 	return rblist__add_node(&ilist->rblist, (void *)((long)i));
 }
 
-void intlist__remove(struct intlist *ilist __used, struct int_node *node)
+void intlist__remove(struct intlist *ilist, struct int_node *node)
 {
-	int_node__delete(node);
+	rblist__remove_node(&ilist->rblist, &node->rb_node);
 }
 
 struct int_node *intlist__find(struct intlist *ilist, int i)

[tip:perf/core] perf tools: Remove the node from rblist in strlist__remove

[tip-bot for Suzuki K. Poulose]

Commit-ID:  4592281403e74dc4401d5803ec9948d43bbee7ae
Gitweb:     http://git.kernel.org/tip/4592281403e74dc4401d5803ec9948d43bbee7ae
Author:     Suzuki K. Poulose <suzuki@in.ibm.com>
AuthorDate: Wed, 29 Aug 2012 11:30:07 +0530
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 5 Sep 2012 17:36:42 -0300

perf tools: Remove the node from rblist in strlist__remove

The following commit:

author	David Ahern <dsahern@gmail.com>
	Tue, 31 Jul 2012 04:31:33 +0000 (22:31 -0600)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Fri, 3 Aug 2012 13:39:51 +0000 (10:39 -0300)
commit	ee8dd3ca43f151d9fbe1edeef68fb8a77eb9f047

causes a double free during a probe deletion as the node is never
removed from the list via strlist__remove(), even though it gets
'deleted' (read free()'d). This causes a double free when we do
strlist__delete() as the node is already deleted but present in the
rblist.

[suzukikp@suzukikp perf]$ sudo ./perf probe -a do_fork
Added new event:
  probe:do_fork        (on do_fork)

You can now use it in all perf tools, such as:

	perf record -e probe:do_fork -aR sleep 1

[suzukikp@suzukikp perf]$ sudo ./perf probe -d do_fork
Removed event: probe:do_fork
*** glibc detected *** ./perf: double free or corruption (fasttop): 0x000000000133d600 ***
======= Backtrace: =========
/lib64/libc.so.6[0x38eec7dda6]
./perf(rblist__delete+0x5c)[0x47d3dc]
./perf(del_perf_probe_events+0xb6)[0x47b826]
./perf(cmd_probe+0x471)[0x42c8d1]
./perf[0x4150b3]
./perf(main+0x501)[0x4148e1]
/lib64/libc.so.6(__libc_start_main+0xed)[0x38eec2169d]
./perf[0x414a61]

Make sure we remove the node from the rblist before we delete the node.
The rblist__remove_node() will invoke rblist->node_delete, which  will
take care of deleting the node with the suitable function provided by
the user.

Reported-by: Ananth N. Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120829055840.7802.1459.stgit@suzukikp.in.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/strlist.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
index 95856ff..155d8b7 100644
--- a/tools/perf/util/strlist.c
+++ b/tools/perf/util/strlist.c
@@ -93,7 +93,7 @@ out:
 
 void strlist__remove(struct strlist *slist, struct str_node *snode)
 {
-	str_node__delete(snode, slist->dupstr);
+	rblist__remove_node(&slist->rblist, &snode->rb_node);
 }
 
 struct str_node *strlist__find(struct strlist *slist, const char *entry)

Re: [tip:perf/core] perf tools: Remove the node from rblist in strlist__remove

[Hannes Frederic Sowa]

On Fri, Sep 7, 2012 at 8:04 AM, tip-bot for Suzuki K. Poulose
<suzuki@in.ibm.com> wrote:
> Reported-by: Ananth N. Mavinakayanahalli <ananth@in.ibm.com>
> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
> Acked-by: David Ahern <dsahern@gmail.com>
> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Link: http://lkml.kernel.org/r/20120829055840.7802.1459.stgit@suzukikp.in.ibm.com
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Shouldn't this patch go to the -stable queues, too?

Re: [tip:perf/core] perf tools: Remove the node from rblist in strlist__remove

[David Ahern]

On 11/3/12 2:07 PM, Hannes Frederic Sowa wrote:
> On Fri, Sep 7, 2012 at 8:04 AM, tip-bot for Suzuki K. Poulose
> <suzuki@in.ibm.com> wrote:
>> Reported-by: Ananth N. Mavinakayanahalli <ananth@in.ibm.com>
>> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
>> Acked-by: David Ahern <dsahern@gmail.com>
>> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
>> Cc: David Ahern <dsahern@gmail.com>
>> Cc: Frederic Weisbecker <fweisbec@gmail.com>
>> Cc: Ingo Molnar <mingo@kernel.org>
>> Cc: Jiri Olsa <jolsa@redhat.com>
>> Cc: Namhyung Kim <namhyung@kernel.org>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Link: http://lkml.kernel.org/r/20120829055840.7802.1459.stgit@suzukikp.in.ibm.com
>> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Shouldn't this patch go to the -stable queues, too?
>

yes for 3.5

David