Re: perf NULL pointer dereference on -rc5

[Stephane Eranian]

On Tue, Dec 13, 2011 at 1:08 PM, Will Deacon <will.deacon@xxxxxxx> wrote:
> On Tue, Dec 13, 2011 at 07:48:55PM +0000, Peter Zijlstra wrote:
>> On Tue, 2011-12-13 at 15:26 +0000, Will Deacon wrote:
>> >
>> > Commit 10c6db11 ("perf: Fix loss of notification with multi-event") seems to
>> > dereference a NULL event->rb in the wakeup handler during Vince Weaver's perf
>> > tests (specifically corner_cases/overflow_requires_mmap).
>> >
>> > This diff seems to fix the problem, but I'm not sure if it just hides something else:
>>
>> No that is about right.. not so very good of us to have missed that.
>
> Well, at least we caught it in the end.
>
>> Can I add your SoB to this?
>
> Sure:
>
> Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
>
Thanks for fixing this. Somehow in my testing I never ran into this problem.

> Will
>
>> ---
>> Subject: perf: Fix ring_buffer_wakeup()
>> From: Will Deacon <will.deacon@xxxxxxx>
>> Date: Tue Dec 13 20:40:45 CET 2011
>>
>> Commit 10c6db11 ("perf: Fix loss of notification with multi-event")
>> seems to unconditionally dereference event->rb in the wakeup handler,
>> this is wrong, there might not be a buffer attached.
>>
>> Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
>> Link: http://lkml.kernel.org/r/20111213152651.GP20297@xxxxxxxxxxxxxxxxxxxxxxxxxx
>> ---
>> Âkernel/events/core.c | Â Â3 +++
>> Â1 file changed, 3 insertions(+)
>>
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -3360,9 +3360,12 @@ static void ring_buffer_wakeup(struct pe
>>
>> Â Â Â rcu_read_lock();
>> Â Â Â rb = rcu_dereference(event->rb);
>> + Â Â if (!rb)
>> + Â Â Â Â Â Â goto unlock;
>> Â Â Â list_for_each_entry_rcu(event, &rb->event_list, rb_entry) {
>> Â Â Â Â Â Â Â wake_up_all(&event->waitq);
>> Â Â Â }
>> +unlock:
>> Â Â Â rcu_read_unlock();
>> Â}
>>
>>
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/