[PATCH -tip][URGENT] kprobes: Calculate the index correctly when freeing the out-of-line execution slot.

[Masami Hiramatsu]

From : Ananth N Mavinakayanahalli <ana...@in.ibm.com>

When freeing the instruction slot, the arithmetic to calculate the index
of the slot in the page needs to account for the total size of the
instruction on the various architectures.

Calculate the index correctly when freeing the out-of-line execution slot.

Signed-off-by: Ananth N Mavinakayanahalli <ana...@in.ibm.com>
Signed-off-by: Masami Hiramatsu <mhir...@redhat.com>
Reported-by: Sachin Sant <sac...@in.ibm.com>
Reported-by: Heiko Carstens <heiko.c...@de.ibm.com>
---
Index: linux-8mar/kernel/kprobes.c
===================================================================
--- linux-8mar.orig/kernel/kprobes.c 2010-03-08 17:10:33.000000000 +0530
+++ linux-8mar/kernel/kprobes.c 2010-03-08 17:12:12.000000000 +0530
@@ -259,7 +259,8 @@
struct kprobe_insn_page *kip;

list_for_each_entry(kip, &c->pages, list) {
- long idx = ((long)slot - (long)kip->insns) / c->insn_size;
+ long idx = ((long)slot - (long)kip->insns) /
+ (c->insn_size * sizeof(kprobe_opcode_t));
if (idx >= 0 && idx < slots_per_page(c)) {
WARN_ON(kip->slot_used[idx] != SLOT_USED);
if (dirty) {
--
Masami Hiramatsu
e-mail: mhir...@redhat.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[tip-bot for Masami Hiramatsu]

Commit-ID: 83ff56f46a8532488ee364bb93a9cb2a59490d33
Gitweb: http://git.kernel.org/tip/83ff56f46a8532488ee364bb93a9cb2a59490d33
Author: Masami Hiramatsu <mhir...@redhat.com>
AuthorDate: Tue, 9 Mar 2010 10:22:19 -0500
Committer: Ingo Molnar <mi...@elte.hu>
CommitDate: Thu, 11 Mar 2010 14:06:16 +0100

kprobes: Calculate the index correctly when freeing the out-of-line execution slot

From : Ananth N Mavinakayanahalli <ana...@in.ibm.com>

When freeing the instruction slot, the arithmetic to calculate
the index of the slot in the page needs to account for the total
size of the instruction on the various architectures.

Calculate the index correctly when freeing the out-of-line
execution slot.

Reported-by: Sachin Sant <sac...@in.ibm.com>

Reported-by: Heiko Carstens <heiko.c...@de.ibm.com>
Signed-off-by: Ananth N Mavinakayanahalli <ana...@in.ibm.com>
Signed-off-by: Masami Hiramatsu <mhir...@redhat.com>

LKML-Reference: <4B9667AB...@redhat.com>
Signed-off-by: Ingo Molnar <mi...@elte.hu>
---
kernel/kprobes.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index fa034d2..0ed46f3 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -259,7 +259,8 @@ static void __kprobes __free_insn_slot(struct kprobe_insn_cache *c,

struct kprobe_insn_page *kip;

list_for_each_entry(kip, &c->pages, list) {
- long idx = ((long)slot - (long)kip->insns) / c->insn_size;
+ long idx = ((long)slot - (long)kip->insns) /
+ (c->insn_size * sizeof(kprobe_opcode_t));
if (idx >= 0 && idx < slots_per_page(c)) {
WARN_ON(kip->slot_used[idx] != SLOT_USED);
if (dirty) {
--