Skip to contentSkip to conversation

power: supply: qcom_smbx: Remove const from desc allocation type

PATCH Applied Kees Cook 3 participants 3 messages Sep 17 – Oct 4

Subsystems (3)
Arm Qualcomm mailing list Power supply Qualcomm SMB charger driver
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 power: supply: qcom_smbx: Remove const from desc allocation type

From: Kees Cook <[email protected]>

In preparation for making the devm_kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct power_supply_desc *", but the converted allocation type would be "const struct power_supply_desc *", as the size was taken from "smb_psy_desc", which is a
"static const struct power_supply_desc". As there is no general way to remove const qualifiers, take the size from the assignment target instead. No change in allocation size results.

Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:
drivers/power/supply/qcom_smbx.o

Assisted-by LLM coccinelle
Signed-off-by Kees Cook <[email protected]>

---
Cc: Casey Connolly <[email protected]>
Cc: Sebastian Reichel <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>

---
 drivers/power/supply/qcom_smbx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/qcom_smbx.c +1 -1
index 67fdb4335338..71c5448aecff 100644
@@ -972,7 +972,7 @@ static int smb_probe(struct platform_device *pdev)
 	supply_config.drv_data = chip;
 	supply_config.fwnode = dev_fwnode(&pdev->dev);
 
-	desc = devm_kzalloc(chip->dev, sizeof(smb_psy_desc), GFP_KERNEL);
+	desc = devm_kzalloc(chip->dev, sizeof(*desc), GFP_KERNEL);
 	if (!desc)
 		return -ENOMEM;
 	memcpy(desc, &smb_psy_desc, sizeof(smb_psy_desc));
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Kees Cook

From: Kees Cook <[email protected]>

In preparation for making the devm_kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct power_supply_desc *", but the converted allocation type would be "const struct power_supply_desc *", as the size was taken from "smb_psy_desc", which is a
"static const struct power_supply_desc". As there is no general way to remove const qualifiers, take the size from the assignment target instead. No change in allocation size results.

Quoted 6 lines

Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:
drivers/power/supply/qcom_smbx.o

Assisted-by LLM coccinelle
Signed-off-by Kees Cook <[email protected]>

---

Reviewed-by Konrad Dybcio <[email protected]>

Konrad

Applied
#2 lore raw
In reply to Kees Cook
Quoted 6 lines · Kees Cook

In preparation for making the devm_kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

Quoted 8 lines

The assigned type is "struct power_supply_desc *", but the converted allocation type would be "const struct power_supply_desc *", as the size was taken from "smb_psy_desc", which is a
"static const struct power_supply_desc". As there is no general way to remove const qualifiers, take the size from the assignment target instead. No change in allocation size results.

[...]

Applied, thanks!

[1/1] power: supply: qcom_smbx: Remove const from desc allocation type

      commit: 6415ce7204af0e282f32c5ca69953d4224ac49fb

Best regards,

Signature · 1 line
Sebastian Reichel <[email protected]>