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 Assisted-by: LLM coccinelle Signed-off-by: Kees Cook <[email protected]> --- 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(-) diff --git a/drivers/phy/realtek/phy-rtk-usb2.c b/drivers/phy/realtek/phy-rtk-usb2.c index 248550ef98ca..1f08b151d90a 100644 --- a/drivers/phy/realtek/phy-rtk-usb2.c +++ b/drivers/phy/realtek/phy-rtk-usb2.c @@ -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; diff --git a/drivers/phy/realtek/phy-rtk-usb3.c b/drivers/phy/realtek/phy-rtk-usb3.c index cce453686db2..4231a8aa0ba5 100644 --- a/drivers/phy/realtek/phy-rtk-usb3.c +++ b/drivers/phy/realtek/phy-rtk-usb3.c @@ -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; -- 2.34.1
