Commit 3d005917 authored Apr 08, 2024 by JP Kobryn Committed by Luo Gengkun Apr 08, 2024

perf/x86/lbr: Filter vsyscall addresses

mainline inclusion
from mainline-v6.6-rc6
commit e5389977
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I94P3R
CVE: CVE-2023-52476

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e53899771a02f798d436655efbd9d4b46c0f9265



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

We found that a panic can occur when a vsyscall is made while LBR sampling
is active. If the vsyscall is interrupted (NMI) for perf sampling, this
call sequence can occur (most recent at top):

    __insn_get_emulate_prefix()
    insn_get_emulate_prefix()
    insn_get_prefixes()
    insn_get_opcode()
    decode_branch_type()
    get_branch_type()
    intel_pmu_lbr_filter()
    intel_pmu_handle_irq()
    perf_event_nmi_handler()

Within __insn_get_emulate_prefix() at frame 0, a macro is called:

    peek_nbyte_next(insn_byte_t, insn, i)

Within this macro, this dereference occurs:

    (insn)->next_byte

Inspecting registers at this point, the value of the next_byte field is the
address of the vsyscall made, for example the location of the vsyscall
version of gettimeofday() at 0xffffffffff600000. The access to an address
in the vsyscall region will trigger an oops due to an unhandled page fault.

To fix the bug, filtering for vsyscalls can be done when
determining the branch type. This patch will return
a "none" branch if a kernel address if found to lie in the
vsyscall region.

Suggested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: JP Kobryn <inwardvessel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org

Conflicts:
	arch/x86/events/utils.c

Signed-off-by: Luo Gengkun <luogengkun2@huawei.com>

parent 183e1907

arch/x86/events/intel/lbr.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include <asm/perf_event.h>
		#include <asm/msr.h>
		#include <asm/insn.h>
		#include <linux/mm.h>

		#include "../perf_event.h"

		@@ -1221,9 +1222,9 @@ static int branch_type(unsigned long from, unsigned long to, int abort)
		* The LBR logs any address in the IP, even if the IP just
		* faulted. This means userspace can control the from address.
		* Ensure we don't blindy read any address by validating it is
		* a known text address.
		* a known text address and not a vsyscall address.
		*/
		if (kernel_text_address(from)) {
		if (kernel_text_address(from) && !in_gate_area_no_mm(from)) {
		addr = (void *)from;
		/*
		* Assume we can get the maximum possible size