From: Jan Beulich <JBeulich@suse.com>
Date: Tue, 28 Feb 2012 10:41:37 +0000 (+0000)
Subject: kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()"
X-Git-Tag: firefly_0821_release~7541^2~1628
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b8a0040ef7112439ad2efac6f1a79aa842b5924f;p=firefly-linux-kernel-4.4.55.git

kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()"

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 <jbeulich@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 749340c1e6fc..f1dcde499f69 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1661,9 +1661,9 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p,
 		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;
 		}