diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-02-28 05:41:37 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2012-03-26 05:26:54 -0400 |
| commit | d37a5ce113efe2801d16077aa4a9f7f2a4c5a186 (patch) | |
| tree | bc1a7cea4fd252a6089290d9d104ad837ce39315 /kernel | |
| parent | ec45ee022a3af6202af523de6f4841e4e1fe3541 (diff) | |
kprobes: adjust "fix a memory leak in function pre_handler_kretprobe()"
BugLink: http://bugs.launchpad.net/bugs/954576
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>
Diffstat (limited to 'kernel')
| -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 749340c1e6f..f1dcde499f6 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
| @@ -1661,9 +1661,9 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p, | |||
| 1661 | ri->task = current; | 1661 | ri->task = current; |
| 1662 | 1662 | ||
| 1663 | if (rp->entry_handler && rp->entry_handler(ri, regs)) { | 1663 | if (rp->entry_handler && rp->entry_handler(ri, regs)) { |
| 1664 | raw_spin_lock_irqsave(&rp->lock, flags); | 1664 | spin_lock_irqsave(&rp->lock, flags); |
| 1665 | hlist_add_head(&ri->hlist, &rp->free_instances); | 1665 | hlist_add_head(&ri->hlist, &rp->free_instances); |
| 1666 | raw_spin_unlock_irqrestore(&rp->lock, flags); | 1666 | spin_unlock_irqrestore(&rp->lock, flags); |
| 1667 | return 0; | 1667 | return 0; |
| 1668 | } | 1668 | } |
| 1669 | 1669 | ||
