diff options
| author | Ovidiu Panait <ovpanait@gmail.com> | 2022-06-13 17:02:42 +0300 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-06-14 10:19:39 +0200 |
| commit | 9ce2c85a5c7104829269b904836201ccab6949f1 (patch) | |
| tree | 166ce971b37e506e5b484296f7097693cb320811 /executor/common_usb_linux.h | |
| parent | a3bc5d68bc6cf57c55d4370027c295e367205c86 (diff) | |
executor: fix out of bounds write in lookup_connect_response_in()
gcc 12.1 reports the following -Werror=array-bounds error:
///
In function 'bool lookup_connect_response_in(...)'
executor/common_usb.h:632:66:
error: array subscript 'usb_qualifier_descriptor[0]' is partly outside array
bounds of 'char [8]' [-Werror=array-bounds]
|
632 | qual->bNumConfigurations = index->dev->bNumConfigurations;
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function 'volatile long int syz_usb_connect_impl(...)':
executor/common_usb_linux.h:332:23: note: object 'response_data' of size 8
|
332 | char* response_data = NULL;
| ^~~~~~~~~~~~~
...
In function 'bool lookup_connect_response_in(...)',
executor/common_usb.h:633:57:
error: array subscript 'usb_qualifier_descriptor[0]' is partly outside array
bounds of 'char [8]' [-Werror=array-bounds]
|
633 | qual->bRESERVED = 0;
| ~~~~~~~~~~~~~~~~^~~
In function 'volatile long int syz_usb_connect_impl(...)':
executor/common_usb_linux.h:332:23: note: object 'response_data' of size 8
332 | char* response_data = NULL;
| ^~~~~~~~~~~~~
///
Current code in USB_DT_DEVICE_QUALIFIER case treats respose_data as a buffer,
but in reality it is just a pointer, as detailed in the error trace above. In
order to allow passing a usb_qualifier_descriptor struct back to the caller
(via response_data), add a new parameter to lookup_connect_response_in().
Build tested only.
Fixes: 0c00210ff32 ("executor: always provide DEVICE_QUALIFIER USB descriptor")
Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>
Diffstat (limited to 'executor/common_usb_linux.h')
| -rw-r--r-- | executor/common_usb_linux.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/executor/common_usb_linux.h b/executor/common_usb_linux.h index 451b2a7b1..82dcbade2 100644 --- a/executor/common_usb_linux.h +++ b/executor/common_usb_linux.h @@ -331,9 +331,10 @@ static volatile long syz_usb_connect_impl(uint64 speed, uint64 dev_len, const ch char* response_data = NULL; uint32 response_length = 0; + struct usb_qualifier_descriptor qual; if (event.ctrl.bRequestType & USB_DIR_IN) { - if (!lookup_connect_response_in(fd, descs, &event.ctrl, &response_data, &response_length)) { + if (!lookup_connect_response_in(fd, descs, &event.ctrl, &qual, &response_data, &response_length)) { debug("syz_usb_connect: unknown request, stalling\n"); usb_raw_ep0_stall(fd); continue; |