ima: Free IMA measurement buffer after kexec syscall
[ Upstream commit f31e3386a4e92ba6eda7328cb508462956c94c64 ]
IMA allocates kernel virtual memory to carry forward the measurement
list, from the current kernel to the next kernel on kexec system call,
in ima_add_kexec_buffer() function. This buffer is not freed before
completing the kexec system call resulting in memory leak.
Add ima_buffer field in "struct kimage" to store the virtual address
of the buffer allocated for the IMA measurement list.
Free the memory allocated for the IMA measurement list in
kimage_file_post_load_cleanup() function.
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Suggested-by: Tyler Hicks <tyhicks@linux.microsoft.com>
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Reviewed-by: Tyler Hicks <tyhicks@linux.microsoft.com>
Fixes: 7b8589cc29
("ima: on soft reboot, save the measurement list")
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e436d3f7bd
commit
091b409383
|
@ -293,6 +293,11 @@ struct kimage {
|
||||||
/* Information for loading purgatory */
|
/* Information for loading purgatory */
|
||||||
struct purgatory_info purgatory_info;
|
struct purgatory_info purgatory_info;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_IMA_KEXEC
|
||||||
|
/* Virtual address of IMA measurement buffer for kexec syscall */
|
||||||
|
void *ima_buffer;
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
/* kexec interface functions */
|
/* kexec interface functions */
|
||||||
|
|
|
@ -165,6 +165,11 @@ void kimage_file_post_load_cleanup(struct kimage *image)
|
||||||
vfree(pi->sechdrs);
|
vfree(pi->sechdrs);
|
||||||
pi->sechdrs = NULL;
|
pi->sechdrs = NULL;
|
||||||
|
|
||||||
|
#ifdef CONFIG_IMA_KEXEC
|
||||||
|
vfree(image->ima_buffer);
|
||||||
|
image->ima_buffer = NULL;
|
||||||
|
#endif /* CONFIG_IMA_KEXEC */
|
||||||
|
|
||||||
/* See if architecture has anything to cleanup post load */
|
/* See if architecture has anything to cleanup post load */
|
||||||
arch_kimage_file_post_load_cleanup(image);
|
arch_kimage_file_post_load_cleanup(image);
|
||||||
|
|
||||||
|
|
|
@ -130,6 +130,8 @@ void ima_add_kexec_buffer(struct kimage *image)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
image->ima_buffer = kexec_buffer;
|
||||||
|
|
||||||
pr_debug("kexec measurement buffer for the loaded kernel at 0x%lx.\n",
|
pr_debug("kexec measurement buffer for the loaded kernel at 0x%lx.\n",
|
||||||
kbuf.mem);
|
kbuf.mem);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue