soc: qcom: apr: Add check for idr_alloc and of_property_read_string_index

[ Upstream commit 6d7860f5750d73da2fa1a1f6c9405058a593fa32 ]

As idr_alloc() and of_property_read_string_index() can return negative
numbers, it should be better to check the return value and deal with
the exception.
Therefore, it should be better to use goto statement to stop and return
error.

Fixes: 6adba21eb434 ("soc: qcom: Add APR bus driver")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221107014403.3606-1-jiasheng@iscas.ac.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c
index 5687653..173427b 100644 (file)
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@ -310,11 +310,19 @@ static int apr_add_device(struct device *dev, struct device_node *np,
        adev->dev.driver = NULL;
 
        spin_lock(&apr->svcs_lock);
-       idr_alloc(&apr->svcs_idr, svc, svc_id, svc_id + 1, GFP_ATOMIC);
+       ret = idr_alloc(&apr->svcs_idr, svc, svc_id, svc_id + 1, GFP_ATOMIC);
        spin_unlock(&apr->svcs_lock);
+       if (ret < 0) {
+               dev_err(dev, "idr_alloc failed: %d\n", ret);
+               goto out;
+       }
 
-       of_property_read_string_index(np, "qcom,protection-domain",
-                                     1, &adev->service_path);
+       ret = of_property_read_string_index(np, "qcom,protection-domain",
+                                           1, &adev->service_path);
+       if (ret < 0) {
+               dev_err(dev, "Failed to read second value of qcom,protection-domain\n");
+               goto out;
+       }
 
        dev_info(dev, "Adding APR dev: %s\n", dev_name(&adev->dev));
 
@@ -324,6 +332,7 @@ static int apr_add_device(struct device *dev, struct device_node *np,
                put_device(&adev->dev);
        }
 
+out:
        return ret;
 }