From: samitolvanen@google.com To: Will Deacon <will@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>, Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Dave Martin <Dave.Martin@arm.com>, Kees Cook <keescook@chromium.org>, Laura Abbott <labbott@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Nick Desaulniers <ndesaulniers@google.com>, Jann Horn <jannh@google.com>, Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v2 08/17] kprobes: fix compilation without CONFIG_KRETPROBES Date: Thu, 24 Oct 2019 15:51:23 -0700 Message-ID: <20191024225132.13410-9-samitolvanen@google.com> (raw) In-Reply-To: <20191024225132.13410-1-samitolvanen@google.com> kprobe_on_func_entry and arch_kprobe_on_func_entry need to be available even if CONFIG_KRETPROBES is not selected. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> --- kernel/kprobes.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 53534aa258a6..b5e20a4669b8 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1829,6 +1829,25 @@ unsigned long __weak arch_deref_entry_point(void *entry) return (unsigned long)entry; } +bool __weak arch_kprobe_on_func_entry(unsigned long offset) +{ + return !offset; +} + +bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset) +{ + kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset); + + if (IS_ERR(kp_addr)) + return false; + + if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) || + !arch_kprobe_on_func_entry(offset)) + return false; + + return true; +} + #ifdef CONFIG_KRETPROBES /* * This kprobe pre_handler is registered with every kretprobe. When probe @@ -1885,25 +1904,6 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs) } NOKPROBE_SYMBOL(pre_handler_kretprobe); -bool __weak arch_kprobe_on_func_entry(unsigned long offset) -{ - return !offset; -} - -bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset) -{ - kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset); - - if (IS_ERR(kp_addr)) - return false; - - if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) || - !arch_kprobe_on_func_entry(offset)) - return false; - - return true; -} - int register_kretprobe(struct kretprobe *rp) { int ret = 0; -- 2.24.0.rc0.303.g954a862665-goog
next prev parent reply index Thread overview: 236+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-18 16:10 [PATCH 00/18] add support for Clang's Shadow Call Stack Sami Tolvanen 2019-10-18 16:10 ` [PATCH 01/18] arm64: mm: don't use x18 in idmap_kpti_install_ng_mappings Sami Tolvanen 2019-10-18 16:43 ` Nick Desaulniers 2019-10-18 16:10 ` [PATCH 02/18] arm64/lib: copy_page: avoid x18 register in assembler code Sami Tolvanen 2019-10-18 16:10 ` [PATCH 03/18] arm64: kvm: stop treating register x18 as caller save Sami Tolvanen 2019-10-21 6:19 ` Ard Biesheuvel 2019-10-22 17:22 ` Marc Zyngier 2019-10-22 21:45 ` Sami Tolvanen 2019-10-18 16:10 ` [PATCH 04/18] arm64: kernel: avoid x18 as an arbitrary temp register Sami Tolvanen 2019-10-18 16:10 ` [PATCH 05/18] arm64: kbuild: reserve reg x18 from general allocation by the compiler Sami Tolvanen 2019-10-18 17:32 ` Nick Desaulniers 2019-10-18 19:00 ` Sami Tolvanen 2019-10-21 6:12 ` Ard Biesheuvel 2019-10-21 20:43 ` Sami Tolvanen 2019-10-18 16:10 ` [PATCH 06/18] add support for Clang's Shadow Call Stack (SCS) Sami Tolvanen 2019-10-18 16:58 ` Joe Perches 2019-10-18 17:08 ` Nick Desaulniers 2019-10-18 17:11 ` Sami Tolvanen 2019-10-18 18:32 ` Miguel Ojeda 2019-10-18 20:33 ` Nick Desaulniers 2019-10-19 0:21 ` Miguel Ojeda 2019-10-18 17:42 ` Jann Horn 2019-10-18 17:56 ` Sami Tolvanen 2019-10-22 16:28 ` Mark Rutland 2019-10-22 16:30 ` Kees Cook 2019-10-22 16:49 ` Mark Rutland 2019-10-22 19:26 ` Sami Tolvanen 2019-10-24 13:28 ` Mark Rutland 2019-10-24 14:38 ` Masahiro Yamada 2019-10-23 16:59 ` Sami Tolvanen 2019-10-24 1:47 ` Masahiro Yamada 2019-10-24 12:04 ` Steven Rostedt 2019-10-24 22:17 ` Sami Tolvanen 2019-10-18 16:10 ` [PATCH 07/18] scs: add accounting Sami Tolvanen 2019-10-18 16:10 ` [PATCH 08/18] scs: add support for stack usage debugging Sami Tolvanen 2019-10-18 16:10 ` [PATCH 09/18] trace: disable function graph tracing with SCS Sami Tolvanen 2019-10-18 17:01 ` Steven Rostedt 2019-10-18 17:08 ` Sami Tolvanen 2019-10-21 6:15 ` Ard Biesheuvel 2019-10-18 16:10 ` [PATCH 10/18] kprobes: fix compilation without CONFIG_KRETPROBES Sami Tolvanen 2019-10-18 17:02 ` Steven Rostedt 2019-10-21 9:13 ` Masami Hiramatsu 2019-10-18 16:10 ` [PATCH 11/18] kprobes: disable kretprobes with SCS Sami Tolvanen 2019-10-18 17:04 ` Steven Rostedt 2019-10-21 9:15 ` Masami Hiramatsu 2019-10-18 16:10 ` [PATCH 12/18] arm64: reserve x18 only with Shadow Call Stack Sami Tolvanen 2019-10-18 21:23 ` Nick Desaulniers 2019-10-22 16:00 ` Mark Rutland 2019-10-22 16:27 ` Kees Cook 2019-10-18 16:10 ` [PATCH 13/18] arm64: preserve x18 when CPU is suspended Sami Tolvanen 2019-10-18 16:49 ` Nick Desaulniers 2019-10-18 17:05 ` Sami Tolvanen 2019-10-21 16:56 ` Mark Rutland 2019-10-21 22:43 ` Sami Tolvanen 2019-10-22 15:47 ` Mark Rutland 2019-10-18 16:10 ` [PATCH 14/18] arm64: efi: restore x18 if it was corrupted Sami Tolvanen 2019-10-21 6:20 ` Ard Biesheuvel 2019-10-21 22:39 ` Sami Tolvanen 2019-10-22 5:54 ` Ard Biesheuvel 2019-10-18 16:10 ` [PATCH 15/18] arm64: vdso: disable Shadow Call Stack Sami Tolvanen 2019-10-18 16:10 ` [PATCH 16/18] arm64: kprobes: fix kprobes without CONFIG_KRETPROBES Sami Tolvanen 2019-10-21 6:21 ` Ard Biesheuvel 2019-10-21 16:06 ` Kees Cook 2019-10-18 16:10 ` [PATCH 17/18] arm64: disable SCS for hypervisor code Sami Tolvanen 2019-10-18 16:10 ` [PATCH 18/18] arm64: implement Shadow Call Stack Sami Tolvanen 2019-10-18 17:12 ` Jann Horn 2019-10-18 17:18 ` Sami Tolvanen 2019-10-18 17:23 ` Mark Rutland 2019-10-18 17:35 ` Sami Tolvanen 2019-10-21 16:49 ` Mark Rutland 2019-10-21 9:28 ` [PATCH 00/18] add support for Clang's " Masami Hiramatsu 2019-10-24 22:51 ` [PATCH v2 00/17] " samitolvanen 2019-10-24 22:51 ` [PATCH v2 01/17] arm64: mm: don't use x18 in idmap_kpti_install_ng_mappings samitolvanen 2019-10-25 9:24 ` Mark Rutland 2019-10-24 22:51 ` [PATCH v2 02/17] arm64/lib: copy_page: avoid x18 register in assembler code samitolvanen 2019-10-25 9:41 ` Mark Rutland 2019-10-25 21:40 ` Sami Tolvanen 2019-10-24 22:51 ` [PATCH v2 03/17] arm64: kvm: stop treating register x18 as caller save samitolvanen 2019-10-24 22:51 ` [PATCH v2 04/17] arm64: kernel: avoid x18 as an arbitrary temp register samitolvanen 2019-10-25 10:02 ` Mark Rutland 2019-10-24 22:51 ` [PATCH v2 05/17] add support for Clang's Shadow Call Stack (SCS) samitolvanen 2019-10-25 10:56 ` Mark Rutland 2019-10-25 20:49 ` Sami Tolvanen 2019-10-28 16:35 ` Mark Rutland 2019-10-28 19:57 ` Kees Cook 2019-10-29 18:06 ` Sami Tolvanen 2019-10-25 16:22 ` Nick Desaulniers 2019-10-25 20:51 ` Sami Tolvanen 2019-10-26 15:57 ` Joe Perches 2019-10-28 15:19 ` Sami Tolvanen 2019-10-28 15:31 ` Miguel Ojeda 2019-10-28 16:15 ` Sami Tolvanen 2019-10-24 22:51 ` [PATCH v2 06/17] scs: add accounting samitolvanen 2019-10-24 22:51 ` [PATCH v2 07/17] scs: add support for stack usage debugging samitolvanen 2019-10-24 22:51 ` samitolvanen [this message] 2019-10-24 22:51 ` [PATCH v2 09/17] arm64: disable function graph tracing with SCS samitolvanen 2019-10-25 11:03 ` Mark Rutland 2019-10-29 17:45 ` Sami Tolvanen 2019-10-29 20:35 ` Nick Desaulniers 2019-10-24 22:51 ` [PATCH v2 10/17] arm64: disable kretprobes " samitolvanen 2019-10-24 22:51 ` [PATCH v2 11/17] arm64: reserve x18 from general allocation " samitolvanen 2019-10-24 22:51 ` [PATCH v2 12/17] arm64: preserve x18 when CPU is suspended samitolvanen 2019-10-24 22:51 ` [PATCH v2 13/17] arm64: efi: restore x18 if it was corrupted samitolvanen 2019-10-24 22:51 ` [PATCH v2 14/17] arm64: vdso: disable Shadow Call Stack samitolvanen 2019-10-24 22:51 ` [PATCH v2 15/17] arm64: kprobes: fix kprobes without CONFIG_KRETPROBES samitolvanen 2019-10-24 22:51 ` [PATCH v2 16/17] arm64: disable SCS for hypervisor code samitolvanen 2019-10-25 1:20 ` Steven Rostedt 2019-10-25 1:29 ` Masahiro Yamada 2019-10-25 1:42 ` Steven Rostedt 2019-10-25 19:24 ` Sami Tolvanen 2019-10-24 22:51 ` [PATCH v2 17/17] arm64: implement Shadow Call Stack samitolvanen 2019-10-31 16:46 ` [PATCH v3 00/17] add support for Clang's " samitolvanen 2019-10-31 16:46 ` [PATCH v3 01/17] arm64: mm: avoid x18 in idmap_kpti_install_ng_mappings samitolvanen 2019-10-31 16:46 ` [PATCH v3 02/17] arm64/lib: copy_page: avoid x18 register in assembler code samitolvanen 2019-10-31 16:46 ` [PATCH v3 03/17] arm64: kvm: stop treating register x18 as caller save samitolvanen 2019-11-01 3:48 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 04/17] arm64: kernel: avoid x18 __cpu_soft_restart samitolvanen 2019-11-01 3:47 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 05/17] add support for Clang's Shadow Call Stack (SCS) samitolvanen 2019-11-01 3:51 ` Kees Cook 2019-11-01 16:28 ` Sami Tolvanen 2019-10-31 16:46 ` [PATCH v3 06/17] scs: add accounting samitolvanen 2019-11-01 3:52 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 07/17] scs: add support for stack usage debugging samitolvanen 2019-11-01 3:55 ` Kees Cook 2019-11-01 16:32 ` Sami Tolvanen 2019-11-01 19:02 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 08/17] kprobes: fix compilation without CONFIG_KRETPROBES samitolvanen 2019-11-01 3:55 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 09/17] arm64: kprobes: fix kprobes " samitolvanen 2019-11-01 3:56 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 10/17] arm64: disable kretprobes with SCS samitolvanen 2019-11-01 3:56 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 11/17] arm64: disable function graph tracing " samitolvanen 2019-11-01 3:58 ` Kees Cook 2019-11-01 20:32 ` Sami Tolvanen 2019-10-31 16:46 ` [PATCH v3 12/17] arm64: reserve x18 from general allocation " samitolvanen 2019-10-31 17:11 ` Nick Desaulniers 2019-11-01 3:59 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 13/17] arm64: preserve x18 when CPU is suspended samitolvanen 2019-10-31 17:18 ` Nick Desaulniers 2019-10-31 17:27 ` Sami Tolvanen 2019-10-31 17:34 ` Nick Desaulniers 2019-10-31 17:42 ` Sami Tolvanen 2019-11-01 3:59 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 14/17] arm64: efi: restore x18 if it was corrupted samitolvanen 2019-11-01 4:00 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 15/17] arm64: vdso: disable Shadow Call Stack samitolvanen 2019-10-31 17:28 ` Nick Desaulniers 2019-11-01 4:01 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 16/17] arm64: disable SCS for hypervisor code samitolvanen 2019-11-01 3:46 ` Kees Cook 2019-11-01 4:02 ` Kees Cook 2019-10-31 16:46 ` [PATCH v3 17/17] arm64: implement Shadow Call Stack samitolvanen 2019-11-01 3:45 ` Kees Cook 2019-11-01 15:44 ` Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 00/17] add support for Clang's " Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 01/17] arm64: mm: avoid x18 in idmap_kpti_install_ng_mappings Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 02/17] arm64/lib: copy_page: avoid x18 register in assembler code Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 03/17] arm64: kvm: stop treating register x18 as caller save Sami Tolvanen 2019-11-04 11:04 ` Marc Zyngier 2019-11-04 13:30 ` Marc Zyngier 2019-11-04 11:51 ` Mark Rutland 2019-11-04 21:44 ` Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 04/17] arm64: kernel: avoid x18 __cpu_soft_restart Sami Tolvanen 2019-11-04 11:39 ` Mark Rutland 2019-11-04 16:44 ` Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 05/17] add support for Clang's Shadow Call Stack (SCS) Sami Tolvanen 2019-11-01 22:36 ` Miguel Ojeda 2019-11-04 12:31 ` Mark Rutland 2019-11-04 18:25 ` Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 06/17] scs: add accounting Sami Tolvanen 2019-11-04 13:13 ` Marc Zyngier 2019-11-04 16:42 ` Sami Tolvanen 2019-11-04 16:59 ` Marc Zyngier 2019-11-01 22:11 ` [PATCH v4 07/17] scs: add support for stack usage debugging Sami Tolvanen 2019-11-02 17:31 ` Kees Cook 2019-11-04 12:40 ` Mark Rutland 2019-11-04 21:35 ` Sami Tolvanen 2019-11-05 9:17 ` Mark Rutland 2019-11-01 22:11 ` [PATCH v4 08/17] kprobes: fix compilation without CONFIG_KRETPROBES Sami Tolvanen 2019-11-13 20:27 ` Steven Rostedt 2019-11-01 22:11 ` [PATCH v4 09/17] arm64: kprobes: fix kprobes " Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 10/17] arm64: disable kretprobes with SCS Sami Tolvanen 2019-11-04 17:04 ` Mark Rutland 2019-11-04 23:42 ` Sami Tolvanen 2019-11-05 9:04 ` Mark Rutland 2019-11-01 22:11 ` [PATCH v4 11/17] arm64: disable function graph tracing " Sami Tolvanen 2019-11-04 17:11 ` Mark Rutland 2019-11-04 23:44 ` Sami Tolvanen 2019-11-05 9:15 ` Mark Rutland 2019-11-05 20:00 ` Nick Desaulniers 2019-11-05 22:05 ` Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 12/17] arm64: reserve x18 from general allocation " Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 13/17] arm64: preserve x18 when CPU is suspended Sami Tolvanen 2019-11-04 13:20 ` Marc Zyngier 2019-11-04 21:38 ` Sami Tolvanen 2019-11-04 21:59 ` Nick Desaulniers 2019-11-05 0:02 ` Sami Tolvanen 2019-11-05 14:55 ` Marc Zyngier 2019-11-01 22:11 ` [PATCH v4 14/17] arm64: efi: restore x18 if it was corrupted Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 15/17] arm64: vdso: disable Shadow Call Stack Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 16/17] arm64: disable SCS for hypervisor code Sami Tolvanen 2019-11-01 22:11 ` [PATCH v4 17/17] arm64: implement Shadow Call Stack Sami Tolvanen 2019-11-05 23:55 ` [PATCH v5 00/14] add support for Clang's " Sami Tolvanen 2019-11-05 23:55 ` [PATCH v5 01/14] arm64: mm: avoid x18 in idmap_kpti_install_ng_mappings Sami Tolvanen 2019-11-05 23:55 ` [PATCH v5 02/14] arm64/lib: copy_page: avoid x18 register in assembler code Sami Tolvanen 2019-11-05 23:55 ` [PATCH v5 03/14] arm64: kvm: stop treating register x18 as caller save Sami Tolvanen 2019-11-05 23:55 ` [PATCH v5 04/14] arm64: kernel: avoid x18 in __cpu_soft_restart Sami Tolvanen 2019-11-05 23:55 ` [PATCH v5 05/14] add support for Clang's Shadow Call Stack (SCS) Sami Tolvanen 2019-11-15 15:37 ` Mark Rutland 2019-11-15 18:34 ` Sami Tolvanen 2019-11-05 23:56 ` [PATCH v5 06/14] scs: add accounting Sami Tolvanen 2019-11-05 23:56 ` [PATCH v5 07/14] scs: add support for stack usage debugging Sami Tolvanen 2019-11-05 23:56 ` [PATCH v5 08/14] arm64: disable function graph tracing with SCS Sami Tolvanen 2019-11-15 14:18 ` Mark Rutland 2019-11-05 23:56 ` [PATCH v5 09/14] arm64: reserve x18 from general allocation " Sami Tolvanen 2019-11-05 23:56 ` [PATCH v5 10/14] arm64: preserve x18 when CPU is suspended Sami Tolvanen 2019-11-06 20:39 ` Nick Desaulniers 2019-11-15 14:27 ` Mark Rutland 2019-11-05 23:56 ` [PATCH v5 11/14] arm64: efi: restore x18 if it was corrupted Sami Tolvanen 2019-11-06 4:45 ` Miguel Ojeda 2019-11-07 10:51 ` Ard Biesheuvel 2019-11-07 16:26 ` Sami Tolvanen 2019-11-05 23:56 ` [PATCH v5 12/14] arm64: vdso: disable Shadow Call Stack Sami Tolvanen 2019-11-15 14:43 ` Mark Rutland 2019-11-05 23:56 ` [PATCH v5 13/14] arm64: disable SCS for hypervisor code Sami Tolvanen 2019-11-15 14:46 ` Mark Rutland 2019-11-05 23:56 ` [PATCH v5 14/14] arm64: implement Shadow Call Stack Sami Tolvanen 2019-11-15 15:20 ` Mark Rutland 2019-11-15 20:19 ` Sami Tolvanen 2019-11-18 23:13 ` Sami Tolvanen 2019-11-12 23:44 ` [PATCH v5 00/14] add support for Clang's " Kees Cook 2019-11-13 12:03 ` Will Deacon 2019-11-13 18:33 ` Kees Cook 2019-11-15 14:16 ` Mark Rutland
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191024225132.13410-9-samitolvanen@google.com \ --to=samitolvanen@google.com \ --cc=Dave.Martin@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=clang-built-linux@googlegroups.com \ --cc=jannh@google.com \ --cc=keescook@chromium.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=labbott@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mhiramat@kernel.org \ --cc=miguel.ojeda.sandonis@gmail.com \ --cc=ndesaulniers@google.com \ --cc=rostedt@goodmis.org \ --cc=will@kernel.org \ --cc=yamada.masahiro@socionext.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Kernel-hardening archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kernel-hardening/0 kernel-hardening/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kernel-hardening kernel-hardening/ https://lore.kernel.org/kernel-hardening \ kernel-hardening@lists.openwall.com public-inbox-index kernel-hardening Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/com.openwall.lists.kernel-hardening AGPL code for this site: git clone https://public-inbox.org/public-inbox.git