summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJia-Ju Bai <baijiaju1990@gmail.com>2021-05-06 18:04:38 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:57:39 +0200
commit59622d325a18829365a25a60797c252a5a4ddbd6 (patch)
tree6c3edc20a2d8e77a76344fbf699ec2b5ce453968 /kernel
parent143722a05028ebb8691d349007f85656a4e90a8e (diff)
downloadlinux-stable-59622d325a18829365a25a60797c252a5a4ddbd6.tar.gz
linux-stable-59622d325a18829365a25a60797c252a5a4ddbd6.tar.bz2
linux-stable-59622d325a18829365a25a60797c252a5a4ddbd6.zip
kernel: kexec_file: fix error return code of kexec_calculate_store_digests()
[ 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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kexec_file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 6d0bdedb2e20..9d979b2954ef 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -554,8 +554,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;
desc->flags = 0;