diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2023-09-15 13:20:14 -0600 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2023-10-02 09:48:51 -0700 |
| commit | b7fa76e03b0d83a035b20e0ef1a3d65a4557f76c (patch) | |
| tree | a1671d3ea8fb3255305a1415bf80c82259ed3034 | |
| parent | 8fddc4b660273f96f2d216b04642b070a59c019c (diff) | |
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: b626871a7cda ("usb: atm: Use struct_size() helper")
Signed-off-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/ZQSuboEIhvATAdxN@work
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | drivers/usb/atm/usbatm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 1cdb8758ae01..2da6615fbb6f 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -1018,7 +1018,8 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, size_t size; /* instance init */ - size = struct_size(instance, urbs, num_rcv_urbs + num_snd_urbs); + size = struct_size(instance, urbs, + size_add(num_rcv_urbs, num_snd_urbs)); instance = kzalloc(size, GFP_KERNEL); if (!instance) return -ENOMEM; |