]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soc: qcom: Add check devm_kasprintf() returned value
authorCharles Han <hanchunchao@inspur.com>
Sun, 29 Sep 2024 07:23:49 +0000 (15:23 +0800)
committerBjorn Andersson <andersson@kernel.org>
Tue, 1 Oct 2024 03:23:46 +0000 (22:23 -0500)
devm_kasprintf() can return a NULL pointer on failure but this
returned value in qcom_socinfo_probe() is not checked.

Signed-off-by: Charles Han <hanchunchao@inspur.com>
Link: https://lore.kernel.org/r/20240929072349.202520-1-hanchunchao@inspur.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/soc/qcom/socinfo.c

index 24c3971f2ef17f54dce2a4be54989079c00003cd..e42d86d5f6f91867c941c0689d2f5a144ac0e8a1 100644 (file)
@@ -786,10 +786,16 @@ 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 (offsetof(struct socinfo, serial_num) <= item_size)
+       if (!qs->attr.soc_id || qs->attr.revision)
+               return -ENOMEM;
+
+       if (offsetof(struct socinfo, serial_num) <= item_size) {
                qs->attr.serial_number = devm_kasprintf(&pdev->dev, GFP_KERNEL,
                                                        "%u",
                                                        le32_to_cpu(info->serial_num));
+               if (!qs->attr.serial_number)
+                       return -ENOMEM;
+       }
 
        qs->soc_dev = soc_device_register(&qs->attr);
        if (IS_ERR(qs->soc_dev))