5.4-stable patches

added patches:
	tpm-eventlog-fix-section-mismatch-for-debug_section_mismatch.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index 3a0cd3719fe16f29ebaa8e11ac2b352098d5cdb2..08d17f39971544662dec0e2c243a4bec16a881a5 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -256,3 +256,4 @@ scsi-qla2xxx-fix-erroneous-mailbox-timeout-after-pci-error-injection.patch
 x86-olpc-fix-logical-not-is-only-applied-to-the-left-hand-side.patch
 spmi-trace-fix-stack-out-of-bound-access-in-spmi-tracing-functions.patch
 kexec-keys-s390-make-use-of-built-in-and-secondary-keyring-for-signature-verification.patch
+tpm-eventlog-fix-section-mismatch-for-debug_section_mismatch.patch

diff --git a/queue-5.4/tpm-eventlog-fix-section-mismatch-for-debug_section_mismatch.patch b/queue-5.4/tpm-eventlog-fix-section-mismatch-for-debug_section_mismatch.patch
new file mode 100644 (file)
index 0000000..31b186f
--- /dev/null
+++ b/queue-5.4/tpm-eventlog-fix-section-mismatch-for-debug_section_mismatch.patch
@@ -0,0 +1,42 @@
+From bed4593645366ad7362a3aa7bc0d100d8d8236a8 Mon Sep 17 00:00:00 2001
+From: Huacai Chen <chenhuacai@loongson.cn>
+Date: Mon, 11 Jul 2022 09:17:38 +0800
+Subject: tpm: eventlog: Fix section mismatch for DEBUG_SECTION_MISMATCH
+
+From: Huacai Chen <chenhuacai@loongson.cn>
+
+commit bed4593645366ad7362a3aa7bc0d100d8d8236a8 upstream.
+
+If DEBUG_SECTION_MISMATCH enabled, __calc_tpm2_event_size() will not be
+inlined, this cause section mismatch like this:
+
+WARNING: modpost: vmlinux.o(.text.unlikely+0xe30c): Section mismatch in reference from the variable L0 to the function .init.text:early_ioremap()
+The function L0() references
+the function __init early_memremap().
+This is often because L0 lacks a __init
+annotation or the annotation of early_ioremap is wrong.
+
+Fix it by using __always_inline instead of inline for the called-once
+function __calc_tpm2_event_size().
+
+Fixes: 44038bc514a2 ("tpm: Abstract crypto agile event size calculations")
+Cc: stable@vger.kernel.org # v5.3
+Reported-by: WANG Xuerui <git@xen0n.name>
+Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
+Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/tpm_eventlog.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/tpm_eventlog.h
++++ b/include/linux/tpm_eventlog.h
+@@ -157,7 +157,7 @@ struct tcg_algorithm_info {
+  * Return: size of the event on success, 0 on failure
+  */
+ 
+-static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
++static __always_inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
+                                        struct tcg_pcr_event *event_header,
+                                        bool do_mapping)
+ {