4.19-stable patches

added patches:
	ima-remove-__init-annotation-from-ima_pcrread.patch

diff --git a/queue-4.19/ima-remove-__init-annotation-from-ima_pcrread.patch b/queue-4.19/ima-remove-__init-annotation-from-ima_pcrread.patch
new file mode 100644 (file)
index 0000000..c0314e3
--- /dev/null
+++ b/queue-4.19/ima-remove-__init-annotation-from-ima_pcrread.patch
@@ -0,0 +1,41 @@
+From 8b8c704d913b0fe490af370631a4200e26334ec0 Mon Sep 17 00:00:00 2001
+From: Roberto Sassu <roberto.sassu@huawei.com>
+Date: Sun, 7 Jun 2020 23:00:29 +0200
+Subject: ima: Remove __init annotation from ima_pcrread()
+
+From: Roberto Sassu <roberto.sassu@huawei.com>
+
+commit 8b8c704d913b0fe490af370631a4200e26334ec0 upstream.
+
+Commit 6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in
+ima_eventdigest_init()") added a call to ima_calc_boot_aggregate() so that
+the digest can be recalculated for the boot_aggregate measurement entry if
+the 'd' template field has been requested. For the 'd' field, only SHA1 and
+MD5 digests are accepted.
+
+Given that ima_eventdigest_init() does not have the __init annotation, all
+functions called should not have it. This patch removes __init from
+ima_pcrread().
+
+Cc: stable@vger.kernel.org
+Fixes:  6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()")
+Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/integrity/ima/ima_crypto.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/security/integrity/ima/ima_crypto.c
++++ b/security/integrity/ima/ima_crypto.c
+@@ -641,7 +641,7 @@ int ima_calc_buffer_hash(const void *buf
+       return calc_buffer_shash(buf, len, hash);
+ }
+ 
+-static void __init ima_pcrread(int idx, u8 *pcr)
++static void ima_pcrread(int idx, u8 *pcr)
+ {
+       if (!ima_tpm_chip)
+               return;

diff --git a/queue-4.19/series b/queue-4.19/series
index 96fa90d265d4556ea2571b65f3c9304218503340..c53dad81634d9aa66820d36de1793919e16beeb1 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -22,3 +22,4 @@ net-ethernet-fs_enet-add-missing-module_license.patch
 acpi-scan-add-stub-acpi_create_platform_device-for-c.patch
 drm-msm-call-msm_init_vram-before-binding-the-gpu.patch
 arm-picoxcell-fix-missing-interrupt-parent-propertie.patch
+ima-remove-__init-annotation-from-ima_pcrread.patch