Skip to content

Commit

Permalink
soc: qcom: Add check devm_kasprintf() returned value
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Charles Han authored and Bjorn Andersson committed Oct 1, 2024
1 parent 274e58c commit e694d2b
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/soc/qcom/socinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit e694d2b

Please sign in to comment.