Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b85ca56 authored by Jeya R's avatar Jeya R Committed by Gerrit - the friendly Code Review server
Browse files

msm: adsprpc: Fix race condition in internal_control 



Protect add and update qos request with mutex to
avoid race condition when multiple threads try to add
or update request simultaneously.

Change-Id: Id33b81bf85246ec69c72bad59cca068e627bb21d
Acked-by: default avatarDeepika Singh <dsi@qti.qualcomm.com>
Signed-off-by: default avatarJeya R <jeyr@codeaurora.org>
parent d1e4dff4

drivers/char/adsprpc.c

+5 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ struct fastrpc_file { 
	struct mutex perf_mutex;

	struct pm_qos_request pm_qos_req;

	int qos_request;

	struct mutex pm_qos_mutex;

	struct mutex map_mutex;

	struct mutex fl_map_mutex;

	int refcount;
@@ -3256,6 +3257,7 @@ static int fastrpc_file_free(struct fastrpc_file *fl) 
	mutex_destroy(&fl->perf_mutex);

	mutex_destroy(&fl->fl_map_mutex);

	mutex_destroy(&fl->map_mutex);

	mutex_destroy(&fl->pm_qos_mutex);

	kfree(fl);

	return 0;

}
@@ -3757,6 +3759,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) 
	hlist_add_head(&fl->hn, &me->drivers);

	spin_unlock(&me->hlock);

	mutex_init(&fl->perf_mutex);

	mutex_init(&fl->pm_qos_mutex);

	return 0;

}
@@ -3862,12 +3865,14 @@ static int fastrpc_internal_control(struct fastrpc_file *fl, 
		VERIFY(err, latency != 0);

		if (err)

			goto bail;

		mutex_lock(&fl->pm_qos_mutex);

		if (!fl->qos_request) {

			pm_qos_add_request(&fl->pm_qos_req,

				PM_QOS_CPU_DMA_LATENCY, latency);

			fl->qos_request = 1;

		} else

			pm_qos_update_request(&fl->pm_qos_req, latency);

		mutex_unlock(&fl->pm_qos_mutex);

		break;

	case FASTRPC_CONTROL_SMMU:

		if (!me->legacy)