Skip to contentSkip to conversation

hwspinlock: sprd: Use struct_size() helper in devm_kzalloc()

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Jan 25, 2022 – Jan 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwspinlock: sprd: Use struct_size() helper in devm_kzalloc()

Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows.

Also, address the following sparse warnings:
drivers/hwspinlock/sprd_hwspinlock.c:96:36: warning: using sizeof on a flexible structure

---
 drivers/hwspinlock/sprd_hwspinlock.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/hwspinlock/sprd_hwspinlock.c +1 -2
index d221fc9d756d..22e2ffb91743 100644
@@ -93,8 +93,7 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
 		return -ENODEV;
 
 	sprd_hwlock = devm_kzalloc(&pdev->dev,
-				   sizeof(struct sprd_hwspinlock_dev) +
-				   SPRD_HWLOCKS_NUM * sizeof(*lock),
+				   struct_size(sprd_hwlock, bank.lock, SPRD_HWLOCKS_NUM),
 				   GFP_KERNEL);
 	if (!sprd_hwlock)
 		return -ENOMEM;
Signature · 1 line
2.27.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows.

Also, address the following sparse warnings:
drivers/hwspinlock/sprd_hwspinlock.c:96:36: warning: using sizeof on a flexible structure

LGTM.

Quoted 21 lines
---
 drivers/hwspinlock/sprd_hwspinlock.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/hwspinlock/sprd_hwspinlock.c +1 -3
index d221fc9d756d..22e2ffb91743 100644
@@ -93,8 +93,7 @@ static int sprd_hwspinlock_probe(struct platform_device *pdev)
                return -ENODEV;
 
        sprd_hwlock = devm_kzalloc(&pdev->dev,
-                                  sizeof(struct sprd_hwspinlock_dev) +
-                                  SPRD_HWLOCKS_NUM * sizeof(*lock),
+                                  struct_size(sprd_hwlock, bank.lock, SPRD_HWLOCKS_NUM),
                                   GFP_KERNEL);
        if (!sprd_hwlock)
                return -ENOMEM;
--

2.27.0

Signature · 1 line
Baolin Wang