diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-02-28 10:41:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 10:32:57 -0700 |
| commit | b8a0040ef7112439ad2efac6f1a79aa842b5924f (patch) | |
| tree | f0be22ebf527c32082ef40ff4ce5249f1fbf2052 | |
| parent | 896903eb8ed86754935bb65b377e69dc048eac34 (diff) | |
| download | lwn-b8a0040ef7112439ad2efac6f1a79aa842b5924f.tar.gz lwn-b8a0040ef7112439ad2efac6f1a79aa842b5924f.zip | |
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>
| -rw-r--r-- | kernel/kprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |