From 93a3687671a1f2316f2feca8a127148d9e0d5c68 Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Wed, 15 Jul 2020 10:25:10 -0700 Subject: [PATCH] soc: qcom: pil: Handle uninitialized 'ret' The commit (pil: Fix minidump collection during SSR) failed to set the value of 'ret' in pil_do_minidump() upon the return failure from prepare_minidump_segments(). As a result, the 'goto seg_mapping_fail' will end up returning uninitialized value. Hence, assign an error code explicitly to avoid this situation. Change-Id: I20f0d2c4fd006483c73541937025ed50b265e2b4 Signed-off-by: Raghavendra Rao Ananta --- drivers/soc/qcom/peripheral-loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/soc/qcom/peripheral-loader.c b/drivers/soc/qcom/peripheral-loader.c index 50883e418c9f..1ad9faa80709 100644 --- a/drivers/soc/qcom/peripheral-loader.c +++ b/drivers/soc/qcom/peripheral-loader.c @@ -398,8 +398,10 @@ static int pil_do_minidump(struct pil_desc *desc, void *ramdump_dev) next_offset = prepare_minidump_segments(ramdump_segs, region_info_ss, ss_mdump_seg_cnt_ss, &ss_valid_seg_cnt); - if (next_offset < 0) + if (next_offset < 0) { + ret = -ENOMEM; goto seg_mapping_fail; + } if (desc->num_aux_minidump_ids > 0) { ret = prepare_aux_minidump_segments(&ramdump_segs[next_offset],