summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Kroah-Hartman <griffin@kroah.com>2026-07-09 15:24:16 +0200
committerAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>2026-07-09 15:47:35 +0200
commite4a3c99bbf779d6357adb8101ad18f34c2194306 (patch)
tree3ba29ff1c04db8f6c98ef7ed2800d91a56db4fd5
parentdc59e4fea9d83f03bad6bddf3fa2e52491777482 (diff)
downloadlinux-next-e4a3c99bbf779d6357adb8101ad18f34c2194306.tar.gz
linux-next-e4a3c99bbf779d6357adb8101ad18f34c2194306.zip
soc: mediatek: mtk-socinfo Add error handling in devm_kasprintf()
Add an error check to the devm_kasprintf() function in mtk_socinfo_create_socinfo_node(), returning -ENOMEM if the function failed. Assisted-by: gkh_clanker_t1000 CC: Matthias Brugger <matthias.bgg@gmail.com> CC: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Griffin Kroah-Hartman <griffin@kroah.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-rw-r--r--drivers/soc/mediatek/mtk-socinfo.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/soc/mediatek/mtk-socinfo.c b/drivers/soc/mediatek/mtk-socinfo.c
index 424a1eb82c20..e294730ba709 100644
--- a/drivers/soc/mediatek/mtk-socinfo.c
+++ b/drivers/soc/mediatek/mtk-socinfo.c
@@ -76,11 +76,14 @@ static int mtk_socinfo_create_socinfo_node(struct mtk_socinfo *mtk_socinfop)
if (!attrs)
return -ENOMEM;
- if (data->marketing_name != NULL && data->marketing_name[0] != '\0')
+ if (data->marketing_name != NULL && data->marketing_name[0] != '\0') {
attrs->family = devm_kasprintf(mtk_socinfop->dev, GFP_KERNEL, "MediaTek %s",
data->marketing_name);
- else
+ if (!attrs->family)
+ return -ENOMEM;
+ } else {
attrs->family = soc_manufacturer;
+ }
attrs->soc_id = data->soc_name;
/*