commit 9391421406228d3f8ad65bcff5c1699527c34d60
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Nov 16 07:20:28 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Nov 16 07:20:28 2023 +0000
tree 9d37bf1041163dc1f4f67e864fce90afac991a2b
parent 167a7e0488d901e679bef1782a350eb935114f54
parent 78ebe432701b713dc40fddf2236eebae4a781935

Merge cherrypicks of ['partner-android-review.googlesource.com/2660674'] into android13-msm-pixelwatch-5.15-eos-release.

Change-Id: I49d82a26cd75931b6e81e844a043def05ae17872

drivers/char/adsprpc.c

diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index dee23d9..5319f18 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -5067,6 +5067,7 @@
 	int err = 0;
 	struct fastrpc_mmap *map = NULL;
 
+	mutex_lock(&fl->internal_map_mutex);
 	VERIFY(err, fl->dsp_proc_init == 1);
 	if (err) {
 		pr_err("adsprpc: ERROR: %s: user application %s trying to map without initialization\n",
@@ -5105,6 +5106,7 @@
 			mutex_unlock(&fl->map_mutex);
 		}
 	}
+	mutex_unlock(&fl->internal_map_mutex);
 	return err;
 }
 
@@ -5115,6 +5117,7 @@
 	struct fastrpc_mmap *map = NULL;
 	size_t map_size = 0;
 
+	mutex_lock(&fl->internal_map_mutex);
 	VERIFY(err, fl->dsp_proc_init == 1);
 	if (err) {
 		pr_err("adsprpc: ERROR: %s: user application %s trying to map without initialization\n",
@@ -5161,6 +5164,7 @@
 			mutex_unlock(&fl->map_mutex);
 		}
 	}
+	mutex_unlock(&fl->internal_map_mutex);
 	return err;
 }