usb: atm: Use struct_size() helper

PATCH New Gustavo A. R. Silva 1 participant 1 message Sep 28, 2021

Subsystems (3)

USB ATM Alcatel speedtouch USB driver

lore

Share & tools

lore

Gustavo A. R. Silva

author

2021-09-28 23:35 UTC #0 lore raw

PATCH 1/1 usb: atm: Use struct_size() helper

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 worse scenario, could lead to heap overflows.

Link https://github.com/KSPP/linux/issues/160

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/usb/atm/usbatm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/usb/atm/usbatm.c +3 -1

index 33ae03ac13a6..da17be1ef64e 100644
@@ -1015,9 +1015,11 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
 	int error = -ENOMEM;
 	int i, length;
 	unsigned int maxpacket, num_packets;
+	size_t size;
 
 	/* instance init */
-	instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
+	size = struct_size(instance, urbs, num_rcv_urbs + num_snd_urbs);
+	instance = kzalloc(size, GFP_KERNEL);
 	if (!instance)
 		return -ENOMEM;

Signature · 1 line

2.27.0