From: Greg Kroah-Hartman Date: Mon, 18 Jan 2021 09:12:09 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.19.169~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45249301047e2a3572fe35edb3cd6e7fbb5c0673;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..c0314e3de96 --- /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 +Date: Sun, 7 Jun 2020 23:00:29 +0200 +Subject: ima: Remove __init annotation from ima_pcrread() + +From: Roberto Sassu + +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 +Signed-off-by: Roberto Sassu +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 96fa90d265d..c53dad81634 100644 --- 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