| From 50c2b3207fd5f4381a61140afe63a74739b10970 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 May 2021 18:04:38 -0700 |
| Subject: kernel: kexec_file: fix error return code of |
| kexec_calculate_store_digests() |
| |
| From: Jia-Ju Bai <baijiaju1990@gmail.com> |
| |
| [ Upstream commit 31d82c2c787d5cf65fedd35ebbc0c1bd95c1a679 ] |
| |
| When vzalloc() returns NULL to sha_regions, no error return code of |
| kexec_calculate_store_digests() is assigned. To fix this bug, ret is |
| assigned with -ENOMEM in this case. |
| |
| Link: https://lkml.kernel.org/r/20210309083904.24321-1-baijiaju1990@gmail.com |
| Fixes: a43cac0d9dc2 ("kexec: split kexec_file syscall code to kexec_file.c") |
| Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> |
| Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> |
| Acked-by: Baoquan He <bhe@redhat.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/kexec_file.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c |
| index 7825adcc5efc..aea9104265f2 100644 |
| --- a/kernel/kexec_file.c |
| +++ b/kernel/kexec_file.c |
| @@ -740,8 +740,10 @@ static int kexec_calculate_store_digests(struct kimage *image) |
| |
| sha_region_sz = KEXEC_SEGMENT_MAX * sizeof(struct kexec_sha_region); |
| sha_regions = vzalloc(sha_region_sz); |
| - if (!sha_regions) |
| + if (!sha_regions) { |
| + ret = -ENOMEM; |
| goto out_free_desc; |
| + } |
| |
| desc->tfm = tfm; |
| |
| -- |
| 2.30.2 |
| |