phy: realtek: usb: Remove const from phy_cfg allocation type
PATCH 1/1 phy: realtek: usb: Remove const from phy_cfg 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.)
In both the USB2 and USB3 PHY drivers, the assigned type is "struct phy_cfg *", but the converted allocation type would be "const struct phy_cfg *", as the size was taken from the local "phy_cfg", which points to const as it comes from of_device_get_match_data(). 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/phy/realtek/phy-rtk-usb2.o drivers/phy/realtek/phy-rtk-usb3.o
---
Cc: Vinod Koul <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Manivannan Sadhasivam <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Stanley Chang <[email protected]>
Cc: Johan Hovold <[email protected]>
Cc: "Uwe Kleine-König" <[email protected]>
Cc: Jinjie Ruan <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Charles Han <[email protected]>
Cc: <[email protected]>
--- drivers/phy/realtek/phy-rtk-usb2.c | 3 ++- drivers/phy/realtek/phy-rtk-usb3.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/phy/realtek/phy-rtk-usb2.c +2 -1
@@ -1022,7 +1022,8 @@ static int rtk_usb2phy_probe(struct platform_device *pdev)return -ENOMEM ; rtk_phy->dev = &pdev->dev; - rtk_phy->phy_cfg =devm_kzalloc (dev,sizeof (*phy_cfg),GFP_KERNEL ); + rtk_phy->phy_cfg =devm_kzalloc (dev,sizeof (*rtk_phy->phy_cfg), +GFP_KERNEL );if (!rtk_phy->phy_cfg)return -ENOMEM ;
drivers/phy/realtek/phy-rtk-usb3.c +2 -1
@@ -576,7 +576,8 @@ static int rtk_usb3phy_probe(struct platform_device *pdev)return -ENOMEM ; rtk_phy->dev = &pdev->dev; - rtk_phy->phy_cfg =devm_kzalloc (dev,sizeof (*phy_cfg),GFP_KERNEL ); + rtk_phy->phy_cfg =devm_kzalloc (dev,sizeof (*rtk_phy->phy_cfg), +GFP_KERNEL );if (!rtk_phy->phy_cfg)return -ENOMEM ;
Signature · 1 line
2.34.1
Quoted 14 lines · Kees Cook
In preparation for making the
devm_kmallocfamily 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.)In both the USB2 and USB3 PHY drivers, the assigned type is "struct
phy_cfg*", but the converted allocation type would be "const structphy_cfg*", as the size was taken from the local "phy_cfg", which points to const as it comes fromof_device_get_match_data(). 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 1 line
[...]
Applied, thanks!
[1/1] phy: realtek: usb: Remove const from phy_cfg allocation type
commit: 88498cfc3ce6d8ccd3080ab4cc3f394eb2754b1b
Best regards,
Signature · 1 line
~Vinod