Commit 6d7860f5 authored by 蒋家盛's avatar 蒋家盛 Committed by Bjorn Andersson
Browse files

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



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: 6adba21e ("soc: qcom: Add APR bus driver")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221107014403.3606-1-jiasheng@iscas.ac.cn
parent 759dcdf2

drivers/soc/qcom/apr.c

+12 −3
Original line number Diff line number Diff line
@@ -454,11 +454,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",

	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/GPR dev: %s\n", dev_name(&adev->dev));
@@ -468,6 +476,7 @@ static int apr_add_device(struct device *dev, struct device_node *np, 
		put_device(&adev->dev);

	}



out:

	return ret;

}