From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20120309190218.092690160@linuxfoundation.org> Date: Fri, 09 Mar 2012 11:02:53 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jan Beulich Subject: [ 39/68] kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()" In-Reply-To: <20120309194409.GA2069@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Beulich 3.0.21's 603b63484725a6e88e4ae5da58716efd88154b1e directly used the upstream patch, yet kprobes locking in 3.0.x uses spin_lock...() rather than raw_spin_lock...(). Signed-off-by: Jan Beulich Signed-off-by: Greg Kroah-Hartman --- kernel/kprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1663,9 +1663,9 @@ static int __kprobes pre_handler_kretpro ri->task = current; if (rp->entry_handler && rp->entry_handler(ri, regs)) { - raw_spin_lock_irqsave(&rp->lock, flags); + spin_lock_irqsave(&rp->lock, flags); hlist_add_head(&ri->hlist, &rp->free_instances); - raw_spin_unlock_irqrestore(&rp->lock, flags); + spin_unlock_irqrestore(&rp->lock, flags); return 0; }