[PATCH] perf_events: fix bogus copy_to_user() in perf_event_read_group()

[PATCH] perf_events: fix bogus copy_to_user() in perf_event_read_group()

[Stephane Eranian]

       When using an event group, the value and id for non leaders events were
       wrong due to invalid offset into the outgoing buffer.

       Signed-off-by: Stephane Eranian <eranian@google.com>

---
 perf_event.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 0b0d5f7..8306127 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -1826,7 +1826,7 @@ static int perf_event_read_group(struct perf_event *event,

               size = n * sizeof(u64);

-               if (copy_to_user(buf + size, values, size)) {
+               if (copy_to_user(buf + ret, values, size)) {
                       ret = -EFAULT;
                       goto unlock;
               }

Re: [PATCH] perf_events: fix bogus copy_to_user() in perf_event_read_group()

[Peter Zijlstra]

On Mon, 2009-11-23 at 17:36 +0100, Stephane Eranian wrote:
>        When using an event group, the value and id for non leaders events were
>        wrong due to invalid offset into the outgoing buffer.
> 
>        Signed-off-by: Stephane Eranian <eranian@google.com>

Gah, I only just wrecked that didn't I...

Thanks for catching that.

Re: [PATCH] perf_events: fix bogus copy_to_user() in perf_event_read_group()

[Stephane Eranian]

On Mon, Nov 23, 2009 at 5:46 PM, Peter Zijlstra <peterz@infradead.org> wrote:
> On Mon, 2009-11-23 at 17:36 +0100, Stephane Eranian wrote:
>>        When using an event group, the value and id for non leaders events were
>>        wrong due to invalid offset into the outgoing buffer.
>>
>>        Signed-off-by: Stephane Eranian <eranian@google.com>
>
> Gah, I only just wrecked that didn't I...
>
Probably because it worked before.

> Thanks for catching that.
>
>



-- 
Stephane Eranian  | EMEA Software Engineering
Google France | 38 avenue de l'Opéra | 75002 Paris
Tel : +33 (0) 1 42 68 53 00
This email may be confidential or privileged. If you received this
communication by mistake, please
don't forward it to anyone else, please erase all copies and
attachments, and please let me know that
it went to the wrong person. Thanks

Re: [PATCH] perf_events: fix bogus copy_to_user() in perf_event_read_group()

[Ingo Molnar]

* Stephane Eranian <eranian@google.com> wrote:

> ?? ?? ?? ??When using an event group, the value and id for non leaders events were
> ?? ?? ?? ??wrong due to invalid offset into the outgoing buffer.
> 
> ?? ?? ?? ??Signed-off-by: Stephane Eranian <eranian@google.com>
> 
> ---
> ??perf_event.c | ?? ??2 +-
> ??1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/perf_event.c b/kernel/perf_event.c
> index 0b0d5f7..8306127 100644
> --- a/kernel/perf_event.c
> +++ b/kernel/perf_event.c
> @@ -1826,7 +1826,7 @@ static int perf_event_read_group(struct perf_event *event,
> 
> ?? ?? ?? ?? ?? ?? ?? ??size = n * sizeof(u64);
> 
> - ?? ?? ?? ?? ?? ?? ?? if (copy_to_user(buf + size, values, size)) {
> + ?? ?? ?? ?? ?? ?? ?? if (copy_to_user(buf + ret, values, size)) {
> ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ??ret = -EFAULT;
> ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ?? ??goto unlock;
> ?? ?? ?? ?? ?? ?? ?? ??}

hm, patch is seriously garbled - mind sending it according to 
Documentation/email-clients.txt?

Thanks,

	Ingo

[PATCH] perf_events: fix bogus copy_to_user() in perf_event_read_group()

[Stephane Eranian]

	[This is a repost due to a formatting problem with Gmail]

	When using an event group, the value and id for non leaders events were
	wrong due to invalid offset into the outgoing buffer.

	Signed-off-by: Stephane Eranian <eranian@google.com>

---
 perf_event.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 0b0d5f7..8306127 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -1826,7 +1826,7 @@ static int perf_event_read_group(struct perf_event *event,
 
 		size = n * sizeof(u64);
 
-		if (copy_to_user(buf + size, values, size)) {
+		if (copy_to_user(buf + ret, values, size)) {
 			ret = -EFAULT;
 			goto unlock;
 		}

[tip:perf/core] perf_events: Fix bogus copy_to_user() in perf_event_read_group()

[tip-bot for Stephane Eranian]

Commit-ID:  184d3da8ef0ca552dffa0fdd35c046e058a2cf9a
Gitweb:     http://git.kernel.org/tip/184d3da8ef0ca552dffa0fdd35c046e058a2cf9a
Author:     Stephane Eranian <eranian@google.com>
AuthorDate: Mon, 23 Nov 2009 21:40:49 -0800
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 24 Nov 2009 08:55:27 +0100

perf_events: Fix bogus copy_to_user() in perf_event_read_group()

When using an event group, the value and id for non leaders events
were wrong due to invalid offset into the outgoing buffer.

Signed-off-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: paulus@samba.org
Cc: perfmon2-devel@lists.sourceforge.net
LKML-Reference: <4b0b71e1.0508d00a.075e.ffff84a3@mx.google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 kernel/perf_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 9425c96..accfd7b 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -1831,7 +1831,7 @@ static int perf_event_read_group(struct perf_event *event,
 
 		size = n * sizeof(u64);
 
-		if (copy_to_user(buf + size, values, size)) {
+		if (copy_to_user(buf + ret, values, size)) {
 			ret = -EFAULT;
 			goto unlock;
 		}