From: Sami Tolvanen <samitolvanen@google.com>
To: Kees Cook <keescook@chromium.org>
Cc: 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>,
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,
Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH 11/17] psci: use __pa_function for cpu_resume
Date: Thu, 11 Mar 2021 16:49:13 -0800 [thread overview]
Message-ID: <20210312004919.669614-12-samitolvanen@google.com> (raw)
In-Reply-To: <20210312004919.669614-1-samitolvanen@google.com>
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 __pa_function instead to get the address to
cpu_resume.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
drivers/firmware/psci/psci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
index f5fc429cae3f..facd3cce3244 100644
--- a/drivers/firmware/psci/psci.c
+++ b/drivers/firmware/psci/psci.c
@@ -326,7 +326,7 @@ static int psci_suspend_finisher(unsigned long state)
{
u32 power_state = state;
- return psci_ops.cpu_suspend(power_state, __pa_symbol(cpu_resume));
+ return psci_ops.cpu_suspend(power_state, __pa_function(cpu_resume));
}
int psci_cpu_suspend_enter(u32 state)
@@ -345,7 +345,7 @@ int psci_cpu_suspend_enter(u32 state)
static int psci_system_suspend(unsigned long unused)
{
return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
- __pa_symbol(cpu_resume), 0, 0);
+ __pa_function(cpu_resume), 0, 0);
}
static int psci_system_suspend_enter(suspend_state_t state)
--
2.31.0.rc2.261.g7f71774620-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sami Tolvanen <samitolvanen@google.com>
To: Kees Cook <keescook@chromium.org>
Cc: 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>,
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,
Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH 11/17] psci: use __pa_function for cpu_resume
Date: Thu, 11 Mar 2021 16:49:13 -0800 [thread overview]
Message-ID: <20210312004919.669614-12-samitolvanen@google.com> (raw)
In-Reply-To: <20210312004919.669614-1-samitolvanen@google.com>
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 __pa_function instead to get the address to
cpu_resume.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
drivers/firmware/psci/psci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
index f5fc429cae3f..facd3cce3244 100644
--- a/drivers/firmware/psci/psci.c
+++ b/drivers/firmware/psci/psci.c
@@ -326,7 +326,7 @@ static int psci_suspend_finisher(unsigned long state)
{
u32 power_state = state;
- return psci_ops.cpu_suspend(power_state, __pa_symbol(cpu_resume));
+ return psci_ops.cpu_suspend(power_state, __pa_function(cpu_resume));
}
int psci_cpu_suspend_enter(u32 state)
@@ -345,7 +345,7 @@ int psci_cpu_suspend_enter(u32 state)
static int psci_system_suspend(unsigned long unused)
{
return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
- __pa_symbol(cpu_resume), 0, 0);
+ __pa_function(cpu_resume), 0, 0);
}
static int psci_system_suspend_enter(suspend_state_t state)
--
2.31.0.rc2.261.g7f71774620-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-03-12 0:50 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 0:49 [PATCH 00/17] Add support for Clang CFI Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 0:49 ` [PATCH 01/17] add " Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:39 ` Kees Cook
2021-03-12 2:39 ` Kees Cook
2021-03-12 0:49 ` [PATCH 02/17] cfi: add __cficanonical Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:40 ` Kees Cook
2021-03-12 2:40 ` Kees Cook
2021-03-12 20:28 ` Bjorn Helgaas
2021-03-12 20:28 ` Bjorn Helgaas
2021-03-12 0:49 ` [PATCH 03/17] mm: add generic __va_function and __pa_function macros Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:40 ` Kees Cook
2021-03-12 2:40 ` Kees Cook
2021-03-12 0:49 ` [PATCH 04/17] module: cfi: ensure __cfi_check alignment Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:39 ` Kees Cook
2021-03-12 2:39 ` Kees Cook
2021-03-16 20:03 ` Sami Tolvanen
2021-03-16 20:03 ` Sami Tolvanen
2021-03-12 0:49 ` [PATCH 05/17] workqueue: cfi: disable callback pointer check with modules Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:43 ` Kees Cook
2021-03-12 2:43 ` Kees Cook
2021-03-12 0:49 ` [PATCH 06/17] kthread: " Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:43 ` Kees Cook
2021-03-12 2:43 ` Kees Cook
2021-03-12 6:13 ` Christoph Hellwig
2021-03-12 6:13 ` Christoph Hellwig
2021-03-17 16:05 ` Sami Tolvanen
2021-03-17 16:05 ` Sami Tolvanen
2021-03-12 0:49 ` [PATCH 07/17] kallsyms: cfi: strip hashes from static functions Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:45 ` Kees Cook
2021-03-12 2:45 ` Kees Cook
2021-03-16 20:33 ` Sami Tolvanen
2021-03-16 20:33 ` Sami Tolvanen
2021-03-12 0:49 ` [PATCH 08/17] bpf: disable CFI in dispatcher functions Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:45 ` Kees Cook
2021-03-12 2:45 ` Kees Cook
2021-03-12 0:49 ` [PATCH 09/17] lib/list_sort: fix function type mismatches Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:45 ` Kees Cook
2021-03-12 2:45 ` Kees Cook
2021-03-12 0:49 ` [PATCH 10/17] lkdtm: use __va_function Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:45 ` Kees Cook
2021-03-12 2:45 ` Kees Cook
2021-03-12 0:49 ` Sami Tolvanen [this message]
2021-03-12 0:49 ` [PATCH 11/17] psci: use __pa_function for cpu_resume Sami Tolvanen
2021-03-12 2:45 ` Kees Cook
2021-03-12 2:45 ` Kees Cook
2021-03-12 0:49 ` [PATCH 12/17] arm64: implement __va_function Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:46 ` Kees Cook
2021-03-12 2:46 ` Kees Cook
2021-03-12 0:49 ` [PATCH 13/17] arm64: use __pa_function Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:46 ` Kees Cook
2021-03-12 2:46 ` Kees Cook
2021-03-12 0:49 ` [PATCH 14/17] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:47 ` Kees Cook
2021-03-12 2:47 ` Kees Cook
2021-03-12 0:49 ` [PATCH 15/17] arm64: add __nocfi to __apply_alternatives Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:50 ` Kees Cook
2021-03-12 2:50 ` Kees Cook
2021-03-12 0:49 ` [PATCH 16/17] KVM: arm64: Disable CFI for nVHE Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:50 ` Kees Cook
2021-03-12 2:50 ` Kees Cook
2021-03-12 0:49 ` [PATCH 17/17] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen
2021-03-12 0:49 ` Sami Tolvanen
2021-03-12 2:51 ` Kees Cook
2021-03-12 2:51 ` Kees Cook
2021-03-16 20:44 ` Sami Tolvanen
2021-03-16 20:44 ` Sami Tolvanen
2021-03-16 23:02 ` Kees Cook
2021-03-16 23:02 ` Kees Cook
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=20210312004919.669614-12-samitolvanen@google.com \
--to=samitolvanen@google.com \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.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=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: link
Be 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.