Skip to contentSkip to conversation

bus: mhi: ep: Use kcalloc() instead of kzalloc()

PATCH Applied Erick Archer 4 participants 4 messages Jan 28, 2024 – Feb 3, 2024

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

PATCH v2 1/1 bus: mhi: ep: Use kcalloc() instead of kzalloc()

This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1].

Here the multiplication is obviously safe because the "event_rings" member never can have a value greater than 255 (8 bits). This member is set twice using always FIELD_GET:

mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval); mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval);

And the MHICFG_NER_MASK macro defines the 8 bits mask that guarantees a maximum value of 255.

However, using kcalloc() is more appropriate [1] and improves readability. This patch has no effect on runtime behavior.

---
Changes in v2:
- Add more info in the commit message to better explain the change. (Dan Carpenter)
- Add the "Reviewed-by:" tag.

Previous versions:
v1 - https://lore.kernel.org/linux-hardening/[email protected]/

---
 drivers/bus/mhi/ep/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/mhi/ep/main.c +3 -2
index 65fc1d738bec..8d7a4102bdb7 100644
@@ -1149,8 +1149,9 @@ int mhi_ep_power_up(struct mhi_ep_cntrl *mhi_cntrl)
 	mhi_ep_mmio_mask_interrupts(mhi_cntrl);
 	mhi_ep_mmio_init(mhi_cntrl);
 
-	mhi_cntrl->mhi_event = kzalloc(mhi_cntrl->event_rings * (sizeof(*mhi_cntrl->mhi_event)),
-					GFP_KERNEL);
+	mhi_cntrl->mhi_event = kcalloc(mhi_cntrl->event_rings,
+				       sizeof(*mhi_cntrl->mhi_event),
+				       GFP_KERNEL);
 	if (!mhi_cntrl->mhi_event)
 		return -ENOMEM;
 

--
2.25.1

maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 13 lines · Erick Archer

This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1].

Here the multiplication is obviously safe because the "event_rings" member never can have a value greater than 255 (8 bits). This member is set twice using always FIELD_GET:

mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval); mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval);

And the MHICFG_NER_MASK macro defines the 8 bits mask that guarantees a maximum value of 255.

Quoted 7 lines

However, using kcalloc() is more appropriate [1] and improves readability. This patch has no effect on runtime behavior.

- Mani

Quoted 31 lines

---
Changes in v2:
- Add more info in the commit message to better explain the change. (Dan Carpenter)
- Add the "Reviewed-by:" tag.

Previous versions:
v1 - https://lore.kernel.org/linux-hardening/[email protected]/

---
 drivers/bus/mhi/ep/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/mhi/ep/main.c +3 -3
index 65fc1d738bec..8d7a4102bdb7 100644
@@ -1149,8 +1149,9 @@ int mhi_ep_power_up(struct mhi_ep_cntrl *mhi_cntrl)
 	mhi_ep_mmio_mask_interrupts(mhi_cntrl);
 	mhi_ep_mmio_init(mhi_cntrl);
 
-	mhi_cntrl->mhi_event = kzalloc(mhi_cntrl->event_rings * (sizeof(*mhi_cntrl->mhi_event)),
-					GFP_KERNEL);
+	mhi_cntrl->mhi_event = kcalloc(mhi_cntrl->event_rings,
+				       sizeof(*mhi_cntrl->mhi_event),
+				       GFP_KERNEL);
 	if (!mhi_cntrl->mhi_event)
 		return -ENOMEM;
 
--

2.25.1

Signature · 1 line
மணிவண்ணன் சதாசிவம்
Reviewed-by on v2 1/1
#2 lore raw
In reply to Erick Archer
Quoted 20 lines · Erick Archer

This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1].

Here the multiplication is obviously safe because the "event_rings" member never can have a value greater than 255 (8 bits). This member is set twice using always FIELD_GET:

mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval); mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval);

And the MHICFG_NER_MASK macro defines the 8 bits mask that guarantees a maximum value of 255.

However, using kcalloc() is more appropriate [1] and improves readability. This patch has no effect on runtime behavior.

Quoted 5 lines

---
Changes in v2:
- Add more info in the commit message to better explain the change. (Dan Carpenter)
- Add the "Reviewed-by:" tag.

Looks good.

Quoted 26 lines

Previous versions:
v1 - https://lore.kernel.org/linux-hardening/[email protected]/

---
  drivers/bus/mhi/ep/main.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/mhi/ep/main.c +3 -3
index 65fc1d738bec..8d7a4102bdb7 100644
@@ -1149,8 +1149,9 @@ int mhi_ep_power_up(struct mhi_ep_cntrl *mhi_cntrl)
  	mhi_ep_mmio_mask_interrupts(mhi_cntrl);
  	mhi_ep_mmio_init(mhi_cntrl);
 
-	mhi_cntrl->mhi_event = kzalloc(mhi_cntrl->event_rings * (sizeof(*mhi_cntrl->mhi_event)),
-					GFP_KERNEL);
+	mhi_cntrl->mhi_event = kcalloc(mhi_cntrl->event_rings,
+				       sizeof(*mhi_cntrl->mhi_event),
+				       GFP_KERNEL);
  	if (!mhi_cntrl->mhi_event)
  		return -ENOMEM;
 
--

2.25.1

#3 lore raw
In reply to Erick Archer
Quoted 13 lines · Erick Archer

This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1].

Here the multiplication is obviously safe because the "event_rings" member never can have a value greater than 255 (8 bits). This member is set twice using always FIELD_GET:

mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval); mhi_cntrl->event_rings = FIELD_GET(MHICFG_NER_MASK, regval);

And the MHICFG_NER_MASK macro defines the 8 bits mask that guarantees a maximum value of 255.

Quoted 7 lines

However, using kcalloc() is more appropriate [1] and improves readability. This patch has no effect on runtime behavior.

Applied to mhi-next!

- Mani

Quoted 31 lines

---
Changes in v2:
- Add more info in the commit message to better explain the change. (Dan Carpenter)
- Add the "Reviewed-by:" tag.

Previous versions:
v1 - https://lore.kernel.org/linux-hardening/[email protected]/

---
 drivers/bus/mhi/ep/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/bus/mhi/ep/main.c +3 -3
index 65fc1d738bec..8d7a4102bdb7 100644
@@ -1149,8 +1149,9 @@ int mhi_ep_power_up(struct mhi_ep_cntrl *mhi_cntrl)
 	mhi_ep_mmio_mask_interrupts(mhi_cntrl);
 	mhi_ep_mmio_init(mhi_cntrl);
 
-	mhi_cntrl->mhi_event = kzalloc(mhi_cntrl->event_rings * (sizeof(*mhi_cntrl->mhi_event)),
-					GFP_KERNEL);
+	mhi_cntrl->mhi_event = kcalloc(mhi_cntrl->event_rings,
+				       sizeof(*mhi_cntrl->mhi_event),
+				       GFP_KERNEL);
 	if (!mhi_cntrl->mhi_event)
 		return -ENOMEM;
 
--

2.25.1

Signature · 1 line
மணிவண்ணன் சதாசிவம்