From f6803cc3d2ae4b7aeb98fd5b45a36b54789113d9 Mon Sep 17 00:00:00 2001
From: vgattupa <vgattupa@codeaurora.org>
Date: Mon, 12 Apr 2021 15:52:03 +0530
Subject: [PATCH] msm: adsprpc: Check for valid error returned from mini dump

Add check to verify if valid error code is returned from mini
dump add region.

Change-Id: I02e2cfef22ce5f812104d7dc05dbb623c5c1670f
Signed-off-by: vgattupa <vgattupa@codeaurora.org>
---
 drivers/char/adsprpc.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 613c066ca3d2..983a533e4c81 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -897,7 +897,7 @@ static inline void reset_unique_index(int index)
  */
 static int fastrpc_minidump_add_region(struct fastrpc_mmap *map)
 {
-	int err = -1, md_index = 0;
+	int err = 0, ret_val = 0, md_index = 0;
 	struct md_region md_entry;
 
 	md_index = get_unique_index();
@@ -906,19 +906,20 @@ static int fastrpc_minidump_add_region(struct fastrpc_mmap *map)
 		md_entry.virt_addr = map->va;
 		md_entry.phys_addr = map->phys;
 		md_entry.size = map->size;
-		err = msm_minidump_add_region(&md_entry);
-		if (err < 0) {
+		ret_val = msm_minidump_add_region(&md_entry);
+		if (ret_val < 0) {
 			ADSPRPC_ERR(
 			"Failed to add/update CMA to Minidump for phys: 0x%llx, size: %zu, md_index %d, md_entry.name %s\n",
 			map->phys,
 			map->size, md_index,
 			md_entry.name);
 			reset_unique_index(md_index);
+			err = ret_val;
 		} else {
 			map->frpc_md_index = md_index;
 		}
 	} else {
-		ADSPRPC_ERR("failed to generate valid unique id for mini dump : %d\n", md_index);
+		pr_warn("failed to generate valid unique id for mini dump : %d\n", md_index);
 	}
 	return err;
 }
@@ -3738,7 +3739,7 @@ bail:
 static int fastrpc_init_create_static_process(struct fastrpc_file *fl,
 				struct fastrpc_ioctl_init *init)
 {
-	int err = 0, rh_hyp_done = 0, mem_create = 0;
+	int err = 0, rh_hyp_done = 0;
 	struct fastrpc_apps *me = &gfa;
 	struct fastrpc_ioctl_invoke_async ioctl;
 	struct smq_phy_page pages[1];
@@ -3795,7 +3796,6 @@ static int fastrpc_init_create_static_process(struct fastrpc_file *fl,
 		mutex_unlock(&fl->map_mutex);
 		if (err)
 			goto bail;
-		mem_create = 1;
 		phys = mem->phys;
 		size = mem->size;
 		/*
@@ -3865,11 +3865,9 @@ bail:
 					"rh hyp unassign failed with %d for phys 0x%llx of size %zu\n",
 					hyp_err, phys, size);
 		}
-		if (mem_create && mem) {
-			mutex_lock(&fl->map_mutex);
-			fastrpc_mmap_free(mem, 0);
-			mutex_unlock(&fl->map_mutex);
-		}
+	mutex_lock(&fl->map_mutex);
+	fastrpc_mmap_free(mem, 0);
+	mutex_unlock(&fl->map_mutex);
 	}
 	return err;
 }