[PATCH v7 1/6] soc: qcom: pdr: protect locator_addr with the main mutex

[Dmitry Baryshkov]

If the service locator server is restarted fast enough, the PDR can
rewrite locator_addr fields concurrently. Protect them by placing
modification of those fields under the main pdr->lock.

Fixes: fbe639b44a82 ("soc: qcom: Introduce Protection Domain Restart helpers")
Tested-by: Neil Armstrong <neil.armstr...@linaro.org> # on SM8550-QRD
Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/soc/qcom/pdr_interface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/pdr_interface.c b/drivers/soc/qcom/pdr_interface.c
index a1b6a4081dea..19cfe4b41235 100644
--- a/drivers/soc/qcom/pdr_interface.c
+++ b/drivers/soc/qcom/pdr_interface.c
@@ -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 const struct qmi_ops pdr_locator_ops = {

-- 
2.39.2