lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[ 39/68] kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()"
3.0-stable review patch.  If anyone has any objections, please let me know.

------------------


From: Jan Beulich <JBeulich@suse.com>

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>

---
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;
}




\
 
 \ /
  Last update: 2012-03-09 21:07    [W:0.189 / U:5.976 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site