Skip to contentSkip to conversation

kexec: Fix error code in kexec_calculate_store_digests()

PATCH In review Dan Carpenter 2 participants 2 messages Dec 9, 2020 – Dec 10, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kexec: Fix error code in kexec_calculate_store_digests()

Return -ENOMEM on allocation failure instead of returning success.

Fixes a43cac0d9dc2 ("kexec: split kexec_file syscall code to kexec_file.c")
---
 kernel/kexec_file.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/kexec_file.c +3 -1
index b02086d70492..9570f380a825 100644
@@ -735,8 +735,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;
 
Signature · 1 line
2.29.2
Acked-by on v1 1/1
#1 lore raw
Quoted 27 lines · Dan Carpenter

Return -ENOMEM on allocation failure instead of returning success.

Fixes a43cac0d9dc2 ("kexec: split kexec_file syscall code to kexec_file.c")
---
 kernel/kexec_file.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/kexec_file.c +3 -1
index b02086d70492..9570f380a825 100644
@@ -735,8 +735,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;
 
Signature · 1 line
2.29.2

Good catch, thanks!

Thanks
Dave