diff options
| author | Kunwu Chan <chentao@kylinos.cn> | 2023-11-24 15:50:21 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-25 15:35:54 -0800 |
| commit | e2717302fbc20f148bcda362facee0444b949a3a (patch) | |
| tree | 632917eec7284d81ccfdad80e187963d1fe7e57c | |
| parent | 98b8a550da83cc392a14298c4b3eaaf0332ae6ad (diff) | |
| download | linux-stable-e2717302fbc20f148bcda362facee0444b949a3a.tar.gz linux-stable-e2717302fbc20f148bcda362facee0444b949a3a.tar.bz2 linux-stable-e2717302fbc20f148bcda362facee0444b949a3a.zip | |
power: supply: Fix null pointer dereference in smb2_probe
[ 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>
| -rw-r--r-- | drivers/power/supply/qcom_pmi8998_charger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/supply/qcom_pmi8998_charger.c b/drivers/power/supply/qcom_pmi8998_charger.c index 10f4dd0caca1..22c7c0e7c522 100644 --- a/drivers/power/supply/qcom_pmi8998_charger.c +++ b/drivers/power/supply/qcom_pmi8998_charger.c @@ -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); |