summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLakshmi Ramasubramanian <nramas@linux.microsoft.com>2021-02-04 09:49:50 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 11:37:50 +0100
commit1facf2415b98fd8dbf6f9b3388c3bd654c01154a (patch)
tree8a80b96cdf9bc0a0b3d1dbc190fa1c919eec3e10 /security
parentf40d1ec3a3dbfe373284c4991d61fe66f1a0b671 (diff)
downloadlinux-stable-1facf2415b98fd8dbf6f9b3388c3bd654c01154a.tar.gz
linux-stable-1facf2415b98fd8dbf6f9b3388c3bd654c01154a.tar.bz2
linux-stable-1facf2415b98fd8dbf6f9b3388c3bd654c01154a.zip
ima: Free IMA measurement buffer on error
[ Upstream commit 6d14c6517885fa68524238787420511b87d671df ] 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. In error code paths this memory is not freed resulting in memory leak. Free the memory allocated for the IMA measurement list in the error code paths in ima_add_kexec_buffer() function. Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> Suggested-by: Tyler Hicks <tyhicks@linux.microsoft.com> Fixes: 7b8589cc29e7 ("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>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_kexec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
index 121de3e04af2..206ddcaa5c67 100644
--- a/security/integrity/ima/ima_kexec.c
+++ b/security/integrity/ima/ima_kexec.c
@@ -119,6 +119,7 @@ void ima_add_kexec_buffer(struct kimage *image)
ret = kexec_add_buffer(&kbuf);
if (ret) {
pr_err("Error passing over kexec measurement buffer.\n");
+ vfree(kexec_buffer);
return;
}