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-03 18:22:43 +0100
commit5db2c9e89a2dfe279bc5527a8f4571197b15f10f (patch)
tree21111c813da69ef7da59d0897279f31d6e92713a /security
parente99fbca3382bc5f1665be04b46e6afeacbd37228 (diff)
downloadlinux-stable-5db2c9e89a2dfe279bc5527a8f4571197b15f10f.tar.gz
linux-stable-5db2c9e89a2dfe279bc5527a8f4571197b15f10f.tar.bz2
linux-stable-5db2c9e89a2dfe279bc5527a8f4571197b15f10f.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 e473eee913cb..40bc385a8076 100644
--- a/security/integrity/ima/ima_kexec.c
+++ b/security/integrity/ima/ima_kexec.c
@@ -122,6 +122,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;
}