korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

KEXEC: Call ima_kexec_cmdline to measure the boot command line args

Browse Source 
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>
This commit is contained in:
Prakhar Srivastava 2019-06-23 23:23:31 -07:00 committed by Mimi Zohar
parent 86b4da8c0e
commit 6a31fcd4cf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/kexec_file.c
View File

@ -198,9 +198,6 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
return ret; return ret;
image->kernel_buf_len = size; 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 */ /* Call arch image probe handlers */
ret = arch_kexec_kernel_image_probe(image, image->kernel_buf, ret = arch_kexec_kernel_image_probe(image, image->kernel_buf,
image->kernel_buf_len); image->kernel_buf_len);
@ -241,8 +238,14 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
ret = -EINVAL; ret = -EINVAL;
goto out; 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 */ /* Call arch image load handlers */
ldata = arch_kexec_kernel_image_load(image); ldata = arch_kexec_kernel_image_load(image);