Unverified Commit 0d7de119 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11104 soc: qcom: pdr: protect locator_addr with the main mutex 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5VZRLUD4V6KXJIHV6FJWPUVIR4RPUWVH/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ5M 
 
Link:https://gitee.com/openeuler/kernel/pulls/11104

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents f9306e52 222455bf

drivers/soc/qcom/pdr_interface.c

+4 −2
Original line number Diff line number Diff line
@@ -76,12 +76,12 @@ static int pdr_locator_new_server(struct qmi_handle *qmi, 
					      locator_hdl);

	struct pdr_service *pds;



	mutex_lock(&pdr->lock);

	/* Create a local client port for QMI communication */

	pdr->locator_addr.sq_family = AF_QIPCRTR;

	pdr->locator_addr.sq_node = svc->node;

	pdr->locator_addr.sq_port = svc->port;



	mutex_lock(&pdr->lock);

	pdr->locator_init_complete = true;

	mutex_unlock(&pdr->lock);
@@ -104,10 +104,10 @@ static void pdr_locator_del_server(struct qmi_handle *qmi, 


	mutex_lock(&pdr->lock);

	pdr->locator_init_complete = false;

	mutex_unlock(&pdr->lock);



	pdr->locator_addr.sq_node = 0;

	pdr->locator_addr.sq_port = 0;

	mutex_unlock(&pdr->lock);

}



static struct qmi_ops pdr_locator_ops = {
@@ -366,12 +366,14 @@ static int pdr_get_domain_list(struct servreg_get_domain_list_req *req, 
	if (ret < 0)

		return ret;



	mutex_lock(&pdr->lock);

	ret = qmi_send_request(&pdr->locator_hdl,

			       &pdr->locator_addr,

			       &txn, SERVREG_GET_DOMAIN_LIST_REQ,

			       SERVREG_GET_DOMAIN_LIST_REQ_MAX_LEN,

			       servreg_get_domain_list_req_ei,

			       req);

	mutex_unlock(&pdr->lock);

	if (ret < 0) {

		qmi_txn_cancel(&txn);

		return ret;