commit 9368b85f55a34b06a79d3388eca4880415edf6cf
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 19 00:57:36 2021 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 19 00:57:35 2021 -0800
tree f4f9af9a5580a0893da7c8099b405a8aa8c34d3d
parent f451fd1eba0022447002c5017261bdc5c9707e95
parent 3dc4bc511876bc6e142e6e504a85b80e0d8803f8

Merge "msm: adsprpc: null pointer check for fl"

drivers/char/adsprpc.c

diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index c7aa94f..7eaa40d 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -739,9 +739,13 @@
 	if (!map)
 		return;
 	fl = map->fl;
-	if (!fl)
+	/* remote heap and dynamic loading memory
+	 * maps expected to initialize with NULL
+	 */
+	if (!fl && !(map->flags == ADSP_MMAP_HEAP_ADDR ||
+				map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR))
 		return;
-	if (!(map->flags == ADSP_MMAP_HEAP_ADDR ||
+	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);