| Message ID | 20241016144852.2888679-1-quic_mmanikan@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 128fdbf36cddc2a901c4889ba1c89fa9f2643f2c |
| Headers | show |
| Series | [1/1] soc: qcom: socinfo: fix revision check in qcom_socinfo_probe() | expand |
On 16.10.2024 4:48 PM, Manikanta Mylavarapu wrote: > In success case, the revision holds a non-null pointer. The current > logic incorrectly returns an error for a non-null pointer, whereas > it should return an error for a null pointer. > > The socinfo driver for IPQ9574 and IPQ5332 is currently broken, > resulting in the following error message > qcom-socinfo qcom-socinfo: probe with driver qcom-socinfo failed with > error -12 > > Add a null check for the revision to ensure it returns an error only in > failure case (null pointer). > > Fixes: e694d2b5c58b ("soc: qcom: Add check devm_kasprintf() returned value") > Signed-off-by: Manikanta Mylavarapu <quic_mmanikan@quicinc.com> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Konrad
On Wed, 16 Oct 2024 20:18:52 +0530, Manikanta Mylavarapu wrote: > In success case, the revision holds a non-null pointer. The current > logic incorrectly returns an error for a non-null pointer, whereas > it should return an error for a null pointer. > > The socinfo driver for IPQ9574 and IPQ5332 is currently broken, > resulting in the following error message > qcom-socinfo qcom-socinfo: probe with driver qcom-socinfo failed with > error -12 > > [...] Applied, thanks! [1/1] soc: qcom: socinfo: fix revision check in qcom_socinfo_probe() commit: 128fdbf36cddc2a901c4889ba1c89fa9f2643f2c Best regards,
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 3c14df7a382c..ecfd3da9d5e8 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -786,7 +786,7 @@ static int qcom_socinfo_probe(struct platform_device *pdev) qs->attr.revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u.%u", SOCINFO_MAJOR(le32_to_cpu(info->ver)), SOCINFO_MINOR(le32_to_cpu(info->ver))); - if (!qs->attr.soc_id || qs->attr.revision) + if (!qs->attr.soc_id || !qs->attr.revision) return -ENOMEM; if (offsetof(struct socinfo, serial_num) <= item_size) {
In success case, the revision holds a non-null pointer. The current logic incorrectly returns an error for a non-null pointer, whereas it should return an error for a null pointer. The socinfo driver for IPQ9574 and IPQ5332 is currently broken, resulting in the following error message qcom-socinfo qcom-socinfo: probe with driver qcom-socinfo failed with error -12 Add a null check for the revision to ensure it returns an error only in failure case (null pointer). Fixes: e694d2b5c58b ("soc: qcom: Add check devm_kasprintf() returned value") Signed-off-by: Manikanta Mylavarapu <quic_mmanikan@quicinc.com> --- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)