diff options
| author | Mimi Zohar <zohar@linux.ibm.com> | 2021-02-10 16:34:06 -0500 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.ibm.com> | 2021-02-10 16:34:06 -0500 |
| commit | cccb0efdef01e8a9f44ac38e081c485f92fac3a4 (patch) | |
| tree | 14f523df71288692520ec98cf851330a0431d666 /security | |
| parent | b3f82afc1041a6a7d5347a01883f4aab7ec133b2 (diff) | |
| parent | f31e3386a4e92ba6eda7328cb508462956c94c64 (diff) | |
| download | linux-cccb0efdef01e8a9f44ac38e081c485f92fac3a4.tar.gz linux-cccb0efdef01e8a9f44ac38e081c485f92fac3a4.tar.bz2 linux-cccb0efdef01e8a9f44ac38e081c485f92fac3a4.zip | |
Merge branch 'ima-kexec-fixes' into next-integrity
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_kexec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c index 121de3e04af2..e29bea3dd4cc 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; } @@ -128,6 +129,8 @@ void ima_add_kexec_buffer(struct kimage *image) return; } + image->ima_buffer = kexec_buffer; + pr_debug("kexec measurement buffer for the loaded kernel at 0x%lx.\n", kbuf.mem); } |