usb: atm: Use struct_size() helper
authorGustavo A. R. Silva <gustavoars@kernel.org>
Tue, 28 Sep 2021 23:39:35 +0000 (18:39 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Oct 2021 10:50:22 +0000 (12:50 +0200)
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 <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20210928233935.GA299525@embeddedor
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/atm/usbatm.c

index 33ae03a..da17be1 100644 (file)
@@ -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;