From: Andrew Morton <akpm@linux-foundation.org>
To: Jiang Liu <liuj97@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Jim Keniston <jkenisto@us.ibm.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Jiang Liu <jiang.liu@huawei.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
"David S. Miller" <davem@davemloft.net>,
stable@vger.kernel.org
Subject: Re: [PATCH] kprobes: fix a memory leak in function pre_handler_kretprobe()
Date: Tue, 31 Jan 2012 13:35:10 -0800 [thread overview]
Message-ID: <20120131133510.c53cb790.akpm@linux-foundation.org> (raw)
In-Reply-To: <1327939812-17157-1-git-send-email-jiang.liu@huawei.com>
On Tue, 31 Jan 2012 00:10:12 +0800
Jiang Liu <liuj97@gmail.com> wrote:
> 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 <jiang.liu@huawei.com>
> Acked-by: Jim Keniston <jkenisto@us.ibm.com>
> Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
> CC: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> CC: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
> CC: "David S. Miller" <davem@davemloft.net>
> CC: stable@vger.kernel.org
> ---
> 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;
> + }
>
kernel/kprobes.c: In function 'pre_handler_kretprobe':
kernel/kprobes.c:1677: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type
include/linux/spinlock.h:272: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
kernel/kprobes.c:1679: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
--- a/kernel/kprobes.c~kprobes-fix-a-memory-leak-in-function-pre_handler_kretprobe-fix
+++ a/kernel/kprobes.c
@@ -1674,9 +1674,9 @@ static int __kprobes pre_handler_kretpro
ri->task = current;
if (rp->entry_handler && rp->entry_handler(ri, regs)) {
- spin_lock_irqsave(&rp->lock, flags);
+ raw_spin_lock_irqsave(&rp->lock, flags);
hlist_add_head(&ri->hlist, &rp->free_instances);
- spin_unlock_irqrestore(&rp->lock, flags);
+ raw_spin_unlock_irqrestore(&rp->lock, flags);
return 0;
}
I'm surprised you didn't notice the warning spew. How well tested is
this code?
next prev parent reply other threads:[~2012-01-31 21:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 16:10 [PATCH] kprobes: fix a memory leak in function pre_handler_kretprobe() Jiang Liu
2012-01-31 21:35 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-11 15:21 Jiang Liu
2012-01-11 16:12 ` Ananth N Mavinakayanahalli
2012-01-11 16:59 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120131133510.c53cb790.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=ananth@in.ibm.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=davem@davemloft.net \
--cc=jiang.liu@huawei.com \
--cc=jkenisto@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liuj97@gmail.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).