KEXEC: Call ima_kexec_cmdline to measure the boot command line args (6a31fcd4) · Commits · 戴 / test

During soft reboot(kexec_file_load) boot command line arguments are not measured. Call ima hook ima_kexec_cmdline to measure the boot command line arguments into IMA measurement list. - call ima_kexec_cmdline from kexec_file_load. - move the call ima_add_kexec_buffer after the cmdline args have been measured. Signed-off-by:

Prakhar Srivastava <prsriva02@gmail.com> Reviewed-by:

James Morris <jamorris@linux.microsoft.com> Acked-by:

Dave Young <dyoung@redhat.com> Signed-off-by:

Mimi Zohar <zohar@linux.ibm.com>

kernel/kexec_file.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -198,9 +198,6 @@ 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);
		@@ -241,8 +238,14 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
		ret = -EINVAL;
		goto out;
		}

		ima_kexec_cmdline(image->cmdline_buf,
		image->cmdline_buf_len - 1);
		}

		/* IMA needs to pass the measurement list to the next kernel. */
		ima_add_kexec_buffer(image);

		/* Call arch image load handlers */
		ldata = arch_kexec_kernel_image_load(image);

Admin message