]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Jan 2019 08:03:45 +0000 (09:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Jan 2019 08:03:45 +0000 (09:03 +0100)
added patches:
scripts-kallsyms-filter-arm64-s-__efistub_-symbols.patch

queue-4.14/scripts-kallsyms-filter-arm64-s-__efistub_-symbols.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/scripts-kallsyms-filter-arm64-s-__efistub_-symbols.patch b/queue-4.14/scripts-kallsyms-filter-arm64-s-__efistub_-symbols.patch
new file mode 100644 (file)
index 0000000..00ec728
--- /dev/null
@@ -0,0 +1,38 @@
+From 1212f7a16af492d59304ba3abccbcc5b5e41423e Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Date: Thu, 1 Mar 2018 17:19:01 +0000
+Subject: scripts/kallsyms: filter arm64's __efistub_ symbols
+
+From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+
+commit 1212f7a16af492d59304ba3abccbcc5b5e41423e upstream.
+
+On arm64, the EFI stub and the kernel proper are essentially the same
+binary, although the EFI stub executes at a different virtual address
+as the kernel. For this reason, the EFI stub is restricted in the
+symbols it can link to, which is ensured by prefixing all EFI stub
+symbols with __efistub_ (and emitting __efistub_ prefixed aliases for
+routines that may be shared between the core kernel and the stub)
+
+These symbols are leaking into kallsyms, polluting the namespace, so
+let's filter them explicitly.
+
+Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ scripts/kallsyms.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c
+@@ -221,6 +221,7 @@ static int symbol_valid(struct sym_entry
+       static char *special_prefixes[] = {
+               "__crc_",               /* modversions */
++              "__efistub_",           /* arm64 EFI stub namespace */
+               NULL };
+       static char *special_suffixes[] = {
index ae23373e68b02cb24726f2bb8a5d4c0aad8b8118..49aaf12007b3537d6a265d420a0fe92bb67191fd 100644 (file)
@@ -90,6 +90,7 @@ gfs2-fix-loop-in-gfs2_rbm_find.patch
 b43-fix-error-in-cordic-routine.patch
 selinux-policydb-fix-byte-order-and-alignment-issues.patch
 lockd-show-pid-of-lockd-for-remote-locks.patch
+scripts-kallsyms-filter-arm64-s-__efistub_-symbols.patch
 arm64-drop-linker-script-hack-to-hide-__efistub_-symbols.patch
 arm64-relocatable-fix-inconsistencies-in-linker-script-and-options.patch
 powerpc-tm-set-msr-just-prior-to-recheckpoint.patch