kernel: kexec_file: fix error return code of kexec_calculate_store_digests()
authorJia-Ju Bai <baijiaju1990@gmail.com>
Fri, 7 May 2021 01:04:38 +0000 (18:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 08:40:31 +0000 (10:40 +0200)
[ 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

index 037c321c56188f9fbb35193072f08052d6e4771f..2edaed6803ff79293bd16a16c8edb7ca74bd2573 100644 (file)
@@ -528,8 +528,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;