diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-14 15:09:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-14 15:09:55 -0700 |
| commit | 23931d935363846a9b39a890d4aead208cd46681 (patch) | |
| tree | 7d8a1f439d4720c53512837981afa0a6245e2d37 | |
| parent | Merge tag 'xfs-6.6-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| parent | perf/x86/lbr: Filter vsyscall addresses (diff) | |
| download | wireguard-linux-23931d935363846a9b39a890d4aead208cd46681.tar.xz wireguard-linux-23931d935363846a9b39a890d4aead208cd46681.zip | |
Merge tag 'perf-urgent-2023-10-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 perf event fix from Ingo Molnar:
"Fix an LBR sampling bug"
* tag 'perf-urgent-2023-10-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/lbr: Filter vsyscall addresses
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/events/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/events/utils.c b/arch/x86/events/utils.c index 76b1f8bb0fd5..dab4ed199227 100644 --- a/arch/x86/events/utils.c +++ b/arch/x86/events/utils.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <asm/insn.h> +#include <linux/mm.h> #include "perf_event.h" @@ -132,9 +133,9 @@ static int get_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 blindly 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 |