From: Namhyung Kim <namhyung@gmail.com>
To: linux-kernel@vger.kernel.org,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 2/5] kprobes: verify jprobe entry point
Date: Thu, 2 Sep 2010 14:02:35 +0900 [thread overview]
Message-ID: <1283403758-3827-3-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1283403758-3827-1-git-send-email-namhyung@gmail.com>
verify jprobe's entry point is a function entry point
using kallsyms' offset value.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
kernel/kprobes.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 8f96701..1b0dbe0 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1339,14 +1339,18 @@ int __kprobes register_jprobes(struct jprobe **jps, int num)
if (num <= 0)
return -EINVAL;
for (i = 0; i < num; i++) {
- unsigned long addr;
+ unsigned long addr, offset;
jp = jps[i];
addr = arch_deref_entry_point(jp->entry);
- /* Todo: Verify probepoint is a function entry point */
- jp->kp.pre_handler = setjmp_pre_handler;
- jp->kp.break_handler = longjmp_break_handler;
- ret = register_kprobe(&jp->kp);
+ /* Verify probepoint is a function entry point */
+ if (kallsyms_lookup_size_offset(addr, NULL, &offset) &&
+ offset == 0) {
+ jp->kp.pre_handler = setjmp_pre_handler;
+ jp->kp.break_handler = longjmp_break_handler;
+ ret = register_kprobe(&jp->kp);
+ } else
+ ret = -EINVAL;
if (ret < 0) {
if (i > 0)
--
1.7.2.2
next prev parent reply other threads:[~2010-09-02 5:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-02 5:02 [PATCH 0/5] kprobes cleanups Namhyung Kim
2010-09-02 5:02 ` [PATCH 1/5] kprobes: remove redundant address check Namhyung Kim
2010-09-02 5:02 ` Namhyung Kim [this message]
2010-09-02 5:02 ` [PATCH 3/5] kprobes: make functions static Namhyung Kim
2010-09-02 5:02 ` [PATCH 4/5] kprobes: remove __dummy_buf Namhyung Kim
2010-09-02 5:02 ` [PATCH 5/5] kprobes: add sparse context annotations Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2010-09-15 1:04 [PATCH RESEND 0/5] kprobes cleanups Namhyung Kim
2010-09-15 1:04 ` [PATCH 2/5] kprobes: verify jprobe entry point Namhyung Kim
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=1283403758-3827-3-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=ananth@in.ibm.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
/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