path: root/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-21 17:08:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-21 17:08:06 -0800
commitd643a990891abdb0fd93ff3740a6f7222fbb756c (patch)
treeba135c64ac4e8a8c54d3a7ab393f8d9db46a0430 /kernel
parent23b6ba45f321bd5c4cddde4b8c85b3f71da3cdb8 (diff)
parentf6692213b5045dc461ce0858fb18cf46f328c202 (diff)
Merge tag 'integrity-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull IMA updates from Mimi Zohar: "New is IMA support for measuring kernel critical data, as per usual based on policy. The first example measures the in memory SELinux policy. The second example measures the kernel version. In addition are four bug fixes to address memory leaks and a missing 'static' function declaration" * tag 'integrity-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: integrity: Make function integrity_add_key() static ima: Free IMA measurement buffer after kexec syscall ima: Free IMA measurement buffer on error IMA: Measure kernel version in early boot selinux: include a consumer of the new IMA critical data hook IMA: define a builtin critical data measurement policy IMA: extend critical data hook to limit the measurement based on a label IMA: limit critical data measurement based on a label IMA: add policy rule to measure critical data IMA: define a hook to measure kernel integrity critical data IMA: add support to measure buffer data hash IMA: generalize keyring specific measurement constructs evm: Fix memleak in init_desc
Diffstat (limited to 'kernel')
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index b02086d70492..5c3447cf7ad5 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -166,6 +166,11 @@ void kimage_file_post_load_cleanup(struct kimage *image)
pi->sechdrs = NULL;
+ vfree(image->ima_buffer);
+ image->ima_buffer = NULL;
+#endif /* CONFIG_IMA_KEXEC */
/* See if architecture has anything to cleanup post load */