Skip to content

Commit b7fa76e

Browse files
GustavoARSilvakees
authored andcommitted
usb: atm: Use size_add() in call to struct_size()
If, for any reason, the open-coded arithmetic causes a wraparound, the protection that `struct_size()` adds against potential integer overflows is defeated. Fix this by hardening call to `struct_size()` with `size_add()`. Fixes: b626871 ("usb: atm: Use struct_size() helper") Signed-off-by: "Gustavo A. R. Silva" <[email protected]> Reviewed-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/ZQSuboEIhvATAdxN@work Signed-off-by: Kees Cook <[email protected]>
1 parent 8fddc4b commit b7fa76e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/usb/atm/usbatm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,8 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
10181018
size_t size;
10191019

10201020
/* instance init */
1021-
size = struct_size(instance, urbs, num_rcv_urbs + num_snd_urbs);
1021+
size = struct_size(instance, urbs,
1022+
size_add(num_rcv_urbs, num_snd_urbs));
10221023
instance = kzalloc(size, GFP_KERNEL);
10231024
if (!instance)
10241025
return -ENOMEM;

0 commit comments

Comments
 (0)