commit 85f57d3e3d2208123a7026c48b09dbdd87cddf77
author Jeya R <jeyr@codeaurora.org> Tue May 26 18:17:26 2020 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 28 03:09:48 2020 -0700
tree 00906b1dc18b39ca8fe3d6278122bb08145f5c3b
parent 3183de70288be20c3db9222b97aa0530839435ce

msm: adsprpc: Check fastrpc file pointer before accessing it

Fastrpc file pointer is assigned NULL value for remote heap region
allocated from CMA. Avoid accessing of this NULL pointer while freeing
the remote heap mapping.

Change-Id: Id4bdc1ff326e5b00937e21ac7eb76d518ecf7ee4
Signed-off-by: Jeya R <jeyr@codeaurora.org>

drivers/char/adsprpc.c

diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 2d23442..03ccd6c 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -726,13 +726,16 @@ static void fastrpc_mmap_free(struct fastrpc_mmap *map, uint32_t flags)
 	if (!map)
 		return;
 	fl = map->fl;
-	cid = fl->cid;
-	VERIFY(err, cid >= ADSP_DOMAIN_ID && cid < NUM_CHANNELS);
-	if (err) {
-		err = -ECHRNG;
-		pr_err("adsprpc: ERROR:%s, Invalid channel id: %d, err:%d",
-			__func__, cid, err);
-		return;
+	if (fl && !(map->flags == ADSP_MMAP_HEAP_ADDR ||
+				map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR)) {
+		cid = fl->cid;
+		VERIFY(err, cid >= ADSP_DOMAIN_ID && cid < NUM_CHANNELS);
+		if (err) {
+			err = -ECHRNG;
+			pr_err("adsprpc: ERROR:%s, Invalid channel id: %d, err:%d",
+				__func__, cid, err);
+			return;
+		}
 	}
 	if (map->flags == ADSP_MMAP_HEAP_ADDR ||
 				map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR) {