projects/linux·commit adad0f33

[PATCH] kprobes: fix race in aggregate kprobe registration

adad0f33 · Keshavamurthy Anil S <[email protected]> · 2005-12-12 00:37:12 -08:00

When registering multiple kprobes at the same address, we leave a small
window where the kprobe hlist will not contain a reference to the
registered kprobe, leading to potentially, a system crash if the breakpoint
is hit on another processor.

Patch below now automically relpace the old kprobe with the new
kprobe from the hash list.

Signed-off-by: Anil S Keshavamurthy <[email protected]>
Acked-by: Ananth N Mavinakayanahalli <[email protected]>
Cc: "Paul E. McKenney" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
adad0f331f9c693129e81e233c5461e2e7c3e443
Parents
b88cb424

Changes

1 files changed · +1 −4

FileStatusAddDelContent
kernel/kprobes.cmodified+1−4View file

kernel/kprobes.c

View file
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index fde5a16..e4f0fc6 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -399,10 +399,7 @@ static inline void add_aggr_kprobe(struct kprobe *ap, struct kprobe *p)
INIT_LIST_HEAD(&ap->list);
list_add_rcu(&p->list, &ap->list);
- INIT_HLIST_NODE(&ap->hlist);
- hlist_del_rcu(&p->hlist);
- hlist_add_head_rcu(&ap->hlist,
- &kprobe_table[hash_ptr(ap->addr, KPROBE_HASH_BITS)]);
+ hlist_replace_rcu(&p->hlist, &ap->hlist);
}
/*