In function pre_handler_kretprobe(), the allocated kretprobe_instance object will get 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 <[email protected]> Acked-by: Jim Keniston <[email protected]> Acked-by: Ananth N Mavinakayanahalli <[email protected]> CC: Masami Hiramatsu <[email protected]> CC: Anil S Keshavamurthy <[email protected]> CC: "David S. Miller" <[email protected]> CC: [email protected] --- kernel/kprobes.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e5d8464..2423295 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1673,8 +1673,12 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p, 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); -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
