* [PATCH][RESEND] kprobes: initialize before using a hlist
@ 2012-01-09 8:20 Ananth N Mavinakayanahalli
2012-01-10 0:47 ` Jim Keniston
0 siblings, 1 reply; 3+ messages in thread
From: Ananth N Mavinakayanahalli @ 2012-01-09 8:20 UTC (permalink / raw)
To: lkml; +Cc: Jim Keniston, Masami Hiramatsu, stable
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Commit ef53d9c5e 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.
(Resent with correct email ID for -stable)
Reported by: Jim Keniston <jkenisto@us.ibm.com>
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: <stable@vger.kernel.org>
---
kernel/kprobes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-3.2/kernel/kprobes.c
===================================================================
--- linux-3.2.orig/kernel/kprobes.c
+++ linux-3.2/kernel/kprobes.c
@@ -1077,6 +1077,7 @@ void __kprobes kprobe_flush_task(struct
/* 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
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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][RESEND] kprobes: initialize before using a hlist
2012-01-09 8:20 [PATCH][RESEND] kprobes: initialize before using a hlist Ananth N Mavinakayanahalli
@ 2012-01-10 0:47 ` Jim Keniston
2012-01-10 2:46 ` Masami Hiramatsu
0 siblings, 1 reply; 3+ messages in thread
From: Jim Keniston @ 2012-01-10 0:47 UTC (permalink / raw)
To: ananth; +Cc: lkml, Masami Hiramatsu, stable
On Mon, 2012-01-09 at 13:50 +0530, Ananth N Mavinakayanahalli wrote:
> From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
>
> Commit ef53d9c5e 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.
>
> (Resent with correct email ID for -stable)
>
> Reported by: Jim Keniston <jkenisto@us.ibm.com>
> Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Cc: <stable@vger.kernel.org>
Acked-by: Jim Keniston <jkenisto@us.ibm.com>
> ---
> kernel/kprobes.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-3.2/kernel/kprobes.c
> ===================================================================
> --- linux-3.2.orig/kernel/kprobes.c
> +++ linux-3.2/kernel/kprobes.c
> @@ -1077,6 +1077,7 @@ void __kprobes kprobe_flush_task(struct
> /* 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
> 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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][RESEND] kprobes: initialize before using a hlist
2012-01-10 0:47 ` Jim Keniston
@ 2012-01-10 2:46 ` Masami Hiramatsu
0 siblings, 0 replies; 3+ messages in thread
From: Masami Hiramatsu @ 2012-01-10 2:46 UTC (permalink / raw)
To: Jim Keniston; +Cc: ananth, lkml, stable
(2012/01/10 9:47), Jim Keniston wrote:
> On Mon, 2012-01-09 at 13:50 +0530, Ananth N Mavinakayanahalli wrote:
>> From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
>>
>> Commit ef53d9c5e 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.
>>
>> (Resent with correct email ID for -stable)
>>
>> Reported by: Jim Keniston <jkenisto@us.ibm.com>
>> Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> Cc: <stable@vger.kernel.org>
>
> Acked-by: Jim Keniston <jkenisto@us.ibm.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Thank you!
>
>> ---
>> kernel/kprobes.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Index: linux-3.2/kernel/kprobes.c
>> ===================================================================
>> --- linux-3.2.orig/kernel/kprobes.c
>> +++ linux-3.2/kernel/kprobes.c
>> @@ -1077,6 +1077,7 @@ void __kprobes kprobe_flush_task(struct
>> /* 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
>> 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);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@hitachi.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-10 2:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-09 8:20 [PATCH][RESEND] kprobes: initialize before using a hlist Ananth N Mavinakayanahalli
2012-01-10 0:47 ` Jim Keniston
2012-01-10 2:46 ` Masami Hiramatsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).