[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1325872561.3351.10.camel@localhost>
Date: Fri, 06 Jan 2012 09:56:01 -0800
From: Jim Keniston <jkenisto@...ux.vnet.ibm.com>
To: Jiang Liu <liuj97@...il.com>
Cc: linux-kernel@...r.kernel.org,
Ananth N Mavinakayanahalli <ananth@...ibm.com>
Subject: Re: [PATCH] kprobe: fix a memory leak in function
pre_handler_kretprobe()
On Sat, 2012-01-07 at 00:49 +0800, Jiang Liu wrote:
> From: Jiang Liu<liuj97@...il.com>
>
> In function pre_handler_kretprobe(), the allocated kretprobe_instance object will
> be leaked if the entry_handler callback returns non-zero. This may cause all the
> preallocated kretprobe_instance objects exhausted. This issue could be reproduced
> by changing samples/kprobes/kretprobe_example.c to probe "mutex_unlock". And the
> fix is straight forward, just put the allocated kretprobe_instance object back
> onto the free_instances list.
>
> Signed-off-by: Jiang Liu<liuj97@...il.com>
> Cc: Hien Nguyen<hien@...ibm.com>
> Cc: Jim Keniston<jkenisto@...ibm.com>
> Cc: Prasanna S Panchamukhi<prasanna@...ibm.com>
Acked-by: Jim Keniston <jkenisto@...ibm.com>
BTW, Prasanna is no longer at IBM, and Hien's address is
hienqngu@...ibm.com . Ananth (cc-ed) is probably IBM's best kprobes
reviewer.
> ---
> kprobes.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -1660,8 +1660,12 @@
> ri->rp = rp;
> ri->task = current;
>
> - if (rp->entry_handler&& rp->entry_handler(ri, regs))
> + if (rp->entry_handler&& rp->entry_handler(ri, regs)) {
> + spin_lock_irqsave(&rp->lock, flags);
> + hlist_add_head(&ri->hlist,&rp->free_instances);
> + spin_unlock_irqrestore(&rp->lock, flags);
> return 0;
> + }
>
> arch_prepare_kretprobe(ri, regs);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists