Commit ea9c6286 authored by Zhen Lei's avatar Zhen Lei Committed by Zheng Zengkai
Browse files

ARM: hw_breakpoint: Do not directly check the event's overflow_handler hook 



hulk inclusion
category: bugfix
bugzilla: 48162
CVE: NA

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

The commit 1879445d ("perf/core: Set event's default
::overflow_handler()") set a default event->overflow_handler in
perf_event_alloc(), and replace the check event->overflow_handler with
is_default_overflow_handler(), but one is missing.

Currently, the bp->overflow_handler can not be NULL. As a result,
enable_single_step() is always not invoked.

Fixes: 1879445d ("perf/core: Set event's default ::overflow_handler()")
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Cc: Wang Nan <wangnan0@huawei.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Reviewed-by: default avatarYang Jihong <yangjihong1@huawei.com>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 69d12201

arch/arm/kernel/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static void breakpoint_handler(unsigned long unknown, struct pt_regs *regs) 
			info->trigger = addr;

			pr_debug("breakpoint fired: address = 0x%x\n", addr);

			perf_bp_event(bp, regs);

			if (!bp->overflow_handler)

			if (is_default_overflow_handler(bp))

				enable_single_step(bp, addr);

			goto unlock;

		}