summaryrefslogtreecommitdiff
path: root/security/integrity/ima
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-08-01 20:17:19 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-08-01 20:17:19 +0300
commit60ee49fac817754a465a16b837347d1e9b7b090e (patch)
tree69c7804aa1330108a7e90cbad1f7b0c0addeec78 /security/integrity/ima
parent8b7054528cd5ac96383aa89315670d74865c8dc2 (diff)
parent68b8e9713c8ec90af93c16e1de51cca18cefdb56 (diff)
downloadlinux-60ee49fac817754a465a16b837347d1e9b7b090e.tar.xz
Merge tag 'x86_kdump_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kdump updates from Borislav Petkov: - Add the ability to pass early an RNG seed to the kernel from the boot loader - Add the ability to pass the IMA measurement of kernel and bootloader to the kexec-ed kernel * tag 'x86_kdump_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/setup: Use rng seeds from setup_data x86/kexec: Carry forward IMA measurement log on kexec
Diffstat (limited to 'security/integrity/ima')
-rw-r--r--security/integrity/ima/ima_kexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
index 13753136f03f..419dc405c831 100644
--- a/security/integrity/ima/ima_kexec.c
+++ b/security/integrity/ima/ima_kexec.c
@@ -137,7 +137,7 @@ void ima_add_kexec_buffer(struct kimage *image)
/*
* Restore the measurement list from the previous kernel.
*/
-void ima_load_kexec_buffer(void)
+void __init ima_load_kexec_buffer(void)
{
void *kexec_buffer = NULL;
size_t kexec_buffer_size = 0;