From: tip-bot for John Blackwood <john.blackwood@ccur.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
a.p.zijlstra@chello.nl, joe.korty@ccur.com, tglx@linutronix.de,
john.blackwood@ccur.com, mingo@elte.hu
Subject: [tip:perf/urgent] perf: Fix incorrect copy_from_user() usage
Date: Tue, 12 Oct 2010 13:08:33 GMT [thread overview]
Message-ID: <tip-ad0cf3478de8677f720ee06393b3147819568d6a@git.kernel.org> (raw)
In-Reply-To: <20100928220311.GA18145@tsunami.ccur.com>
Commit-ID: ad0cf3478de8677f720ee06393b3147819568d6a
Gitweb: http://git.kernel.org/tip/ad0cf3478de8677f720ee06393b3147819568d6a
Author: John Blackwood <john.blackwood@ccur.com>
AuthorDate: Tue, 28 Sep 2010 18:03:11 -0400
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 12 Oct 2010 11:45:01 +0200
perf: Fix incorrect copy_from_user() usage
perf events: repair incorrect use of copy_from_user
This makes the perf_event_period() return 0 instead of
-EFAULT on success.
Signed-off-by: John Blackwood<john.blackwood@ccur.com>
Signed-off-by: Joe Korty <joe.korty@ccur.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100928220311.GA18145@tsunami.ccur.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/perf_event.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index db5b560..b98bed3 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2202,15 +2202,13 @@ static void perf_event_for_each(struct perf_event *event,
static int perf_event_period(struct perf_event *event, u64 __user *arg)
{
struct perf_event_context *ctx = event->ctx;
- unsigned long size;
int ret = 0;
u64 value;
if (!event->attr.sample_period)
return -EINVAL;
- size = copy_from_user(&value, arg, sizeof(value));
- if (size != sizeof(value))
+ if (copy_from_user(&value, arg, sizeof(value)))
return -EFAULT;
if (!value)
prev parent reply other threads:[~2010-10-12 13:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-28 22:03 [PERF EVENTS] fix incorrect copy_from_user usage Joe Korty
2010-10-12 13:08 ` tip-bot for John Blackwood [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-ad0cf3478de8677f720ee06393b3147819568d6a@git.kernel.org \
--to=john.blackwood@ccur.com \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=joe.korty@ccur.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®