power: supply: Fix null pointer dereference in smb2_probe
authorKunwu Chan <chentao@kylinos.cn>
Fri, 24 Nov 2023 07:50:21 +0000 (15:50 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:35:54 +0000 (15:35 -0800)
[ Upstream commit 88f04bc3e737155e13caddf0ba8ed19db87f0212 ]

devm_kasprintf and devm_kzalloc return a pointer to dynamically
allocated memory which can be NULL upon failure.

Fixes: 8648aeb5d7b7 ("power: supply: add Qualcomm PMI8998 SMB2 Charger driver")
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Link: https://lore.kernel.org/r/20231124075021.1335289-1-chentao@kylinos.cn
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/power/supply/qcom_pmi8998_charger.c

index 10f4dd0..22c7c0e 100644 (file)
@@ -973,10 +973,14 @@ static int smb2_probe(struct platform_device *pdev)
        supply_config.of_node = pdev->dev.of_node;
 
        desc = devm_kzalloc(chip->dev, sizeof(smb2_psy_desc), GFP_KERNEL);
+       if (!desc)
+               return -ENOMEM;
        memcpy(desc, &smb2_psy_desc, sizeof(smb2_psy_desc));
        desc->name =
                devm_kasprintf(chip->dev, GFP_KERNEL, "%s-charger",
                               (const char *)device_get_match_data(chip->dev));
+       if (!desc->name)
+               return -ENOMEM;
 
        chip->chg_psy =
                devm_power_supply_register(chip->dev, desc, &supply_config);