mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
646ff9d602
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From b15b8b5f7a9cfc20c2e68ba4a6a402ff44bb6c4a Mon Sep 17 00:00:00 2001
|
|
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
|
|
Date: Fri, 20 Jan 2012 14:34:04 -0800
|
|
Subject: [PATCH 122/129] kprobes: initialize before using a hlist
|
|
|
|
commit d496aab567e7e52b3e974c9192a5de6e77dce32c upstream.
|
|
|
|
Commit ef53d9c5e ("kprobes: improve kretprobe scalability with hashed
|
|
locking") introduced a bug where we can potentially leak
|
|
kretprobe_instances since we initialize a hlist head after having used
|
|
it.
|
|
|
|
Initialize the hlist head before using it.
|
|
|
|
Reported by: Jim Keniston <jkenisto@us.ibm.com>
|
|
Acked-by: Jim Keniston <jkenisto@us.ibm.com>
|
|
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
|
|
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
|
|
Cc: Srinivasa D S <srinivasa@in.ibm.com>
|
|
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
kernel/kprobes.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
|
|
index e5d8464..52fd049 100644
|
|
--- a/kernel/kprobes.c
|
|
+++ b/kernel/kprobes.c
|
|
@@ -1077,6 +1077,7 @@ void __kprobes kprobe_flush_task(struct task_struct *tk)
|
|
/* Early boot. kretprobe_table_locks not yet initialized. */
|
|
return;
|
|
|
|
+ INIT_HLIST_HEAD(&empty_rp);
|
|
hash = hash_ptr(tk, KPROBE_HASH_BITS);
|
|
head = &kretprobe_inst_table[hash];
|
|
kretprobe_table_lock(hash, &flags);
|
|
@@ -1085,7 +1086,6 @@ void __kprobes kprobe_flush_task(struct task_struct *tk)
|
|
recycle_rp_inst(ri, &empty_rp);
|
|
}
|
|
kretprobe_table_unlock(hash, &flags);
|
|
- INIT_HLIST_HEAD(&empty_rp);
|
|
hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
|
|
hlist_del(&ri->hlist);
|
|
kfree(ri);
|
|
--
|
|
1.7.9.5
|
|
|