UBUNTU: Ubuntu-raspi2-4.10.0-1003.5

[mirror_ubuntu-zesty-kernel.git] / kernel / kexec_file.c

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 0c2df7f737925b6d0bd5bf624ceb12e8a6d53d86..b56a558e406db6375bea4b07e5873a4c6f0b401e 100644 (file)
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -19,6 +19,7 @@
 #include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/fs.h>
+#include <linux/ima.h>
 #include <crypto/hash.h>
 #include <crypto/sha.h>
 #include <linux/syscalls.h>
@@ -132,6 +133,9 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
                return ret;
        image->kernel_buf_len = size;
 
+       /* IMA needs to pass the measurement list to the next kernel. */
+       ima_add_kexec_buffer(image);
+
        /* Call arch image probe handlers */
        ret = arch_kexec_kernel_image_probe(image, image->kernel_buf,
                                            image->kernel_buf_len);