From: Mark Rutland <mark.rutland@arm.com> To: Sami Tolvanen <samitolvanen@google.com> Cc: Kees Cook <keescook@chromium.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Masahiro Yamada <masahiroy@kernel.org>, Will Deacon <will@kernel.org>, Jessica Yu <jeyu@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Tejun Heo <tj@kernel.org>, "Paul E. McKenney" <paulmck@kernel.org>, Christoph Hellwig <hch@infradead.org>, Peter Zijlstra <peterz@infradead.org>, Sedat Dilek <sedat.dilek@gmail.com>, Catalin Marinas <catalin.marinas@arm.com>, bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Subject: Re: [PATCH v5 11/18] psci: use function_nocfi for cpu_resume Date: Tue, 6 Apr 2021 12:27:35 +0100 [thread overview] Message-ID: <20210406112735.GB96480@C02TD0UTHF1T.local> (raw) In-Reply-To: <20210401233216.2540591-12-samitolvanen@google.com> On Thu, Apr 01, 2021 at 04:32:09PM -0700, Sami Tolvanen wrote: > With CONFIG_CFI_CLANG, the compiler replaces function pointers with > jump table addresses, which results in __pa_symbol returning the > physical address of the jump table entry. As the jump table contains > an immediate jump to an EL1 virtual address, this typically won't > work as intended. Use function_nocfi to get the actual address of > cpu_resume. > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > Reviewed-by: Kees Cook <keescook@chromium.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > drivers/firmware/psci/psci.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index f5fc429cae3f..64344e84bd63 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -325,8 +325,9 @@ static int __init psci_features(u32 psci_func_id) > static int psci_suspend_finisher(unsigned long state) > { > u32 power_state = state; > + phys_addr_t pa_cpu_resume = __pa_symbol(function_nocfi(cpu_resume)); > > - return psci_ops.cpu_suspend(power_state, __pa_symbol(cpu_resume)); > + return psci_ops.cpu_suspend(power_state, pa_cpu_resume); > } > > int psci_cpu_suspend_enter(u32 state) > @@ -344,8 +345,10 @@ int psci_cpu_suspend_enter(u32 state) > > static int psci_system_suspend(unsigned long unused) > { > + phys_addr_t pa_cpu_resume = __pa_symbol(function_nocfi(cpu_resume)); > + > return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), > - __pa_symbol(cpu_resume), 0, 0); > + pa_cpu_resume, 0, 0); > } > > static int psci_system_suspend_enter(suspend_state_t state) > -- > 2.31.0.208.g409f899ff0-goog >
WARNING: multiple messages have this Message-ID (diff)
From: Mark Rutland <mark.rutland@arm.com> To: Sami Tolvanen <samitolvanen@google.com> Cc: Kees Cook <keescook@chromium.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Masahiro Yamada <masahiroy@kernel.org>, Will Deacon <will@kernel.org>, Jessica Yu <jeyu@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Tejun Heo <tj@kernel.org>, "Paul E. McKenney" <paulmck@kernel.org>, Christoph Hellwig <hch@infradead.org>, Peter Zijlstra <peterz@infradead.org>, Sedat Dilek <sedat.dilek@gmail.com>, Catalin Marinas <catalin.marinas@arm.com>, bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Subject: Re: [PATCH v5 11/18] psci: use function_nocfi for cpu_resume Date: Tue, 6 Apr 2021 12:27:35 +0100 [thread overview] Message-ID: <20210406112735.GB96480@C02TD0UTHF1T.local> (raw) In-Reply-To: <20210401233216.2540591-12-samitolvanen@google.com> On Thu, Apr 01, 2021 at 04:32:09PM -0700, Sami Tolvanen wrote: > With CONFIG_CFI_CLANG, the compiler replaces function pointers with > jump table addresses, which results in __pa_symbol returning the > physical address of the jump table entry. As the jump table contains > an immediate jump to an EL1 virtual address, this typically won't > work as intended. Use function_nocfi to get the actual address of > cpu_resume. > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > Reviewed-by: Kees Cook <keescook@chromium.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > drivers/firmware/psci/psci.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index f5fc429cae3f..64344e84bd63 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -325,8 +325,9 @@ static int __init psci_features(u32 psci_func_id) > static int psci_suspend_finisher(unsigned long state) > { > u32 power_state = state; > + phys_addr_t pa_cpu_resume = __pa_symbol(function_nocfi(cpu_resume)); > > - return psci_ops.cpu_suspend(power_state, __pa_symbol(cpu_resume)); > + return psci_ops.cpu_suspend(power_state, pa_cpu_resume); > } > > int psci_cpu_suspend_enter(u32 state) > @@ -344,8 +345,10 @@ int psci_cpu_suspend_enter(u32 state) > > static int psci_system_suspend(unsigned long unused) > { > + phys_addr_t pa_cpu_resume = __pa_symbol(function_nocfi(cpu_resume)); > + > return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), > - __pa_symbol(cpu_resume), 0, 0); > + pa_cpu_resume, 0, 0); > } > > static int psci_system_suspend_enter(suspend_state_t state) > -- > 2.31.0.208.g409f899ff0-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-06 11:28 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-01 23:31 [PATCH v5 00/18] Add support for Clang CFI Sami Tolvanen 2021-04-01 23:31 ` Sami Tolvanen 2021-04-01 23:31 ` [PATCH v5 01/18] add " Sami Tolvanen 2021-04-01 23:31 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 02/18] cfi: add __cficanonical Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 03/18] mm: add generic function_nocfi macro Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-02 6:37 ` Christoph Hellwig 2021-04-02 6:37 ` Christoph Hellwig 2021-04-06 11:27 ` Mark Rutland 2021-04-06 11:27 ` Mark Rutland 2021-04-01 23:32 ` [PATCH v5 04/18] module: ensure __cfi_check alignment Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 05/18] workqueue: use WARN_ON_FUNCTION_MISMATCH Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 06/18] kthread: " Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 07/18] kallsyms: strip ThinLTO hashes from static functions Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 08/18] bpf: disable CFI in dispatcher functions Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 09/18] treewide: Change list_sort to use const pointers Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 10/18] lkdtm: use function_nocfi Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 11/18] psci: use function_nocfi for cpu_resume Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-06 11:27 ` Mark Rutland [this message] 2021-04-06 11:27 ` Mark Rutland 2021-04-01 23:32 ` [PATCH v5 12/18] arm64: implement function_nocfi Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-06 11:36 ` Mark Rutland 2021-04-06 11:36 ` Mark Rutland 2021-04-06 17:02 ` Sami Tolvanen 2021-04-06 17:02 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 13/18] arm64: use function_nocfi with __pa_symbol Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-06 11:41 ` Mark Rutland 2021-04-06 11:41 ` Mark Rutland 2021-04-01 23:32 ` [PATCH v5 14/18] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-06 11:53 ` Mark Rutland 2021-04-06 11:53 ` Mark Rutland 2021-04-06 12:59 ` Ard Biesheuvel 2021-04-06 12:59 ` Ard Biesheuvel 2021-04-06 17:43 ` Sami Tolvanen 2021-04-06 17:43 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 15/18] arm64: add __nocfi to __apply_alternatives Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 16/18] arm64: ftrace: use function_nocfi for ftrace_call Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-06 11:58 ` Mark Rutland 2021-04-06 11:58 ` Mark Rutland 2021-04-01 23:32 ` [PATCH v5 17/18] KVM: arm64: Disable CFI for nVHE Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-01 23:32 ` [PATCH v5 18/18] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen 2021-04-01 23:32 ` Sami Tolvanen 2021-04-02 19:58 ` [PATCH v5 00/18] Add support for Clang CFI Nathan Chancellor 2021-04-02 19:58 ` Nathan Chancellor
Reply instructions: You may reply publicly 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=20210406112735.GB96480@C02TD0UTHF1T.local \ --to=mark.rutland@arm.com \ --cc=arnd@arndb.de \ --cc=bpf@vger.kernel.org \ --cc=catalin.marinas@arm.com \ --cc=clang-built-linux@googlegroups.com \ --cc=hch@infradead.org \ --cc=jeyu@kernel.org \ --cc=keescook@chromium.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-hardening@vger.kernel.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=masahiroy@kernel.org \ --cc=nathan@kernel.org \ --cc=ndesaulniers@google.com \ --cc=paulmck@kernel.org \ --cc=peterz@infradead.org \ --cc=samitolvanen@google.com \ --cc=sedat.dilek@gmail.com \ --cc=tj@kernel.org \ --cc=will@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.