diff options
Diffstat (limited to 'sys/linux')
| -rw-r--r-- | sys/linux/test/vusb_ath9k | 2 | ||||
| -rw-r--r-- | sys/linux/test/vusb_cdc_ecm | 2 | ||||
| -rw-r--r-- | sys/linux/test/vusb_cdc_ncm | 2 | ||||
| -rw-r--r-- | sys/linux/test/vusb_hid | 6 | ||||
| -rw-r--r-- | sys/linux/vusb.txt | 22 |
5 files changed, 17 insertions, 17 deletions
diff --git a/sys/linux/test/vusb_ath9k b/sys/linux/test/vusb_ath9k index bd095a9cb..a728664f0 100644 --- a/sys/linux/test/vusb_ath9k +++ b/sys/linux/test/vusb_ath9k @@ -1,4 +1,4 @@ # requires: -repeat r0 = syz_usb_connect_ath9k(0x3, 0x5a, &(0x7f0000000080)={{0x12, 0x1, 0x200, 0xff, 0xff, 0xff, 0x40, 0xcf3, 0x9271, 0x108, 0x1, 0x2, 0x3, 0x1, [{{0x9, 0x2, 0x48, 0x1, 0x1, 0x0, 0x80, 0xfa, {{0x9, 0x4, 0x0, 0x0, 0x6, 0xff, 0x0, 0x0, 0x0, "", {{0x9, 0x5, 0x1, 0x2, 0x200, 0x0, 0x0, 0x0, ""}, {0x9, 0x5, 0x82, 0x2, 0x200, 0x0, 0x0, 0x0, ""}, {0x9, 0x5, 0x83, 0x3, 0x40, 0x1, 0x0, 0x0, ""}, {0x9, 0x5, 0x4, 0x3, 0x40, 0x1, 0x0, 0x0, ""}, {0x9, 0x5, 0x5, 0x2, 0x200, 0x0, 0x0, 0x0, ""}, {0x9, 0x5, 0x6, 0x2, 0x200, 0x0, 0x0, 0x0, ""}}}}}}]}}, 0x0) -syz_usb_ep_write$ath9k_ep2(r0, 0x2, 0x10, &(0x7f0000000000)=@ready={0x0, 0x0, 0x8, 'BBBB', {0x1, 0x0, 0x0, 0x0, 0x0}}) +syz_usb_ep_write$ath9k_ep2(r0, 0x83, 0x10, &(0x7f0000000000)=@ready={0x0, 0x0, 0x8, 'BBBB', {0x1, 0x0, 0x0, 0x0, 0x0}}) diff --git a/sys/linux/test/vusb_cdc_ecm b/sys/linux/test/vusb_cdc_ecm index 848158cc4..d6997255c 100644 --- a/sys/linux/test/vusb_cdc_ecm +++ b/sys/linux/test/vusb_cdc_ecm @@ -4,4 +4,4 @@ r0 = syz_usb_connect$cdc_ecm(0x0, 0x4d, &(0x7f0000000000)={{0x12, 0x1, 0x0, 0x2, syz_usb_control_io$cdc_ecm(r0, 0x0, 0x0) syz_usb_control_io$cdc_ecm(r0, 0x0, 0x0) syz_usb_control_io$cdc_ecm(r0, &(0x7f0000000080)={0x14, 0x0, &(0x7f0000000040)={0x0, 0x3, 0x1a, {0x1a, 0x3, {0x3400320034003200, 0x3400320034003200, 0x3400320034003200}}}}, 0x0) -syz_usb_ep_write(r0, 0x0, 0x5, &(0x7f0000002340)='hello') +syz_usb_ep_write(r0, 0x82, 0x5, &(0x7f0000002340)='hello') diff --git a/sys/linux/test/vusb_cdc_ncm b/sys/linux/test/vusb_cdc_ncm index f360a6dd3..4ffdb5efa 100644 --- a/sys/linux/test/vusb_cdc_ncm +++ b/sys/linux/test/vusb_cdc_ncm @@ -6,4 +6,4 @@ syz_usb_control_io$cdc_ncm(r0, 0x0, 0x0) syz_usb_control_io$cdc_ncm(r0, 0x0, &(0x7f0000000340)={0x44, 0x0, 0x0, 0x0, &(0x7f0000000200)={0x20, 0x80, 0x1c, {0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10}}, 0x0, 0x0, 0x0, 0x0}) syz_usb_control_io$cdc_ncm(r0, 0x0, 0x0) syz_usb_control_io$cdc_ncm(r0, &(0x7f0000000080)={0x14, 0x0, &(0x7f0000000040)={0x0, 0x3, 0x1a, {0x1a, 0x3, {0x3400320034003200, 0x3400320034003200, 0x3400320034003200}}}}, 0x0) -syz_usb_ep_write(r0, 0x0, 0x5, &(0x7f0000002340)='hello') +syz_usb_ep_write(r0, 0x82, 0x5, &(0x7f0000002340)='hello') diff --git a/sys/linux/test/vusb_hid b/sys/linux/test/vusb_hid index de77a8dc2..b092470f9 100644 --- a/sys/linux/test/vusb_hid +++ b/sys/linux/test/vusb_hid @@ -3,6 +3,6 @@ r0 = syz_usb_connect$hid(0x0, 0x36, &(0x7f0000000040)=ANY=[@ANYBLOB="12010000000018105e04da07000000000001090224000100000000090400000903000000092100000001222200090581030800000000"], 0x0) syz_usb_control_io$hid(r0, 0x0, 0x0) syz_usb_control_io$hid(r0, &(0x7f00000001c0)={0x24, 0x0, 0x0, &(0x7f0000000000)={0x0, 0x22, 0x22, {[@global=@item_012={0x2, 0x1, 0x9, "2313"}, @global=@item_012={0x2, 0x1, 0x0, "e53f"}, @global=@item_4={0x3, 0x1, 0x0, '\f\x00'}, @local=@item_012={0x2, 0x2, 0x2, "9000"}, @global=@item_4={0x3, 0x1, 0x0, "0900be00"}, @main=@item_4={0x3, 0x0, 0x8, '\x00'}, @local=@item_4={0x3, 0x2, 0x0, "09007a15"}, @local=@item_4={0x3, 0x2, 0x0, "5d8c3dda"}]}}, 0x0}, 0x0) -syz_usb_ep_write(r0, 0x0, 0x7, &(0x7f0000000000)='BBBBBBB') -syz_usb_ep_write(r0, 0x0, 0x7, &(0x7f0000000000)='BBBBBBB') -syz_usb_ep_write(r0, 0x0, 0x7, &(0x7f0000000000)='BBBBBBB') +syz_usb_ep_write(r0, 0x81, 0x7, &(0x7f0000000000)='BBBBBBB') +syz_usb_ep_write(r0, 0x81, 0x7, &(0x7f0000000000)='BBBBBBB') +syz_usb_ep_write(r0, 0x81, 0x7, &(0x7f0000000000)='BBBBBBB') diff --git a/sys/linux/vusb.txt b/sys/linux/vusb.txt index af3bb02db..4597bce93 100644 --- a/sys/linux/vusb.txt +++ b/sys/linux/vusb.txt @@ -24,8 +24,8 @@ resource fd_usb[int32]: -1 # They are mostly targeted to cover the enumeration process. syz_usb_connect(speed flags[usb_device_speed], dev_len len[dev], dev ptr[in, usb_device_descriptor], conn_descs ptr[in, vusb_connect_descriptors]) fd_usb (timeout[3000], prog_timeout[3000]) syz_usb_control_io(fd fd_usb, descs ptr[in, vusb_descriptors], resps ptr[in, vusb_responses]) (timeout[300]) -syz_usb_ep_write(fd fd_usb, ep int16[0:31], len len[data], data ptr[in, array[int8, 0:256]]) (timeout[300]) -syz_usb_ep_read(fd fd_usb, ep int16[0:31], len len[data], data buffer[out]) (timeout[300]) +syz_usb_ep_write(fd fd_usb, ep int8, len len[data], data ptr[in, array[int8, 0:256]]) (timeout[300]) +syz_usb_ep_read(fd fd_usb, ep int8, len len[data], data buffer[out]) (timeout[300]) syz_usb_disconnect(fd fd_usb) (timeout[300]) usb_device_speed = USB_SPEED_UNKNOWN, USB_SPEED_LOW, USB_SPEED_FULL, USB_SPEED_HIGH, USB_SPEED_WIRELESS, USB_SPEED_SUPER, USB_SPEED_SUPER_PLUS @@ -1334,11 +1334,18 @@ vusb_responses_uac1 { include <drivers/net/wireless/ath/ath9k/htc_hst.h> include <drivers/net/wireless/ath/ath9k/hif_usb.h> +define USB_ENDPOINT_ATH9K_BULK_OUT_ADDRESS (1) +define USB_ENDPOINT_ATH9K_BULK_IN_ADDRESS (2 | USB_DIR_IN) +define USB_ENDPOINT_ATH9K_INT_IN_ADDRESS (3 | USB_DIR_IN) +define USB_ENDPOINT_ATH9K_INT_OUT_ADDRESS (4) +define USB_ENDPOINT_ATH9K_BULK_EXTRA1_ADDRESS (5) +define USB_ENDPOINT_ATH9K_BULK_EXTRA2_ADDRESS (6) + resource fd_usb_ath9k[fd_usb] syz_usb_connect_ath9k(speed const[USB_SPEED_HIGH], dev_len len[dev], dev ptr[in, usb_device_descriptor_ath9k], conn_descs const[0]) fd_usb_ath9k (timeout[3000], prog_timeout[3000]) -syz_usb_ep_write$ath9k_ep1(fd fd_usb_ath9k, ep const[0x1], len bytesize[data], data ptr[in, ath9k_bulk_frame]) (timeout[300]) -syz_usb_ep_write$ath9k_ep2(fd fd_usb_ath9k, ep const[0x2], len bytesize[data], data ptr[in, htc_frame]) (timeout[300]) +syz_usb_ep_write$ath9k_ep1(fd fd_usb_ath9k, ep const[USB_ENDPOINT_ATH9K_BULK_IN_ADDRESS], len bytesize[data], data ptr[in, ath9k_bulk_frame]) (timeout[300]) +syz_usb_ep_write$ath9k_ep2(fd fd_usb_ath9k, ep const[USB_ENDPOINT_ATH9K_INT_IN_ADDRESS], len bytesize[data], data ptr[in, htc_frame]) (timeout[300]) usb_device_descriptor_ath9k { inner usb_device_descriptor_fixed_t[0x200, USB_CLASS_VENDOR_SPEC, USB_SUBCLASS_VENDOR_SPEC, 0xff, 64, 0xcf3, 0x9271, 0x108, array[usb_config_descriptor_ath9k, 1]] @@ -1361,13 +1368,6 @@ usb_endpoint_descriptors_ath9k { bulk_extra2 usb_endpoint_descriptor_fixed_t[USB_ENDPOINT_ATH9K_BULK_EXTRA2_ADDRESS, USB_ENDPOINT_ATH9K_BULK_ATTRIBUTES, 512, 0, void] } [packed] -define USB_ENDPOINT_ATH9K_BULK_OUT_ADDRESS (1) -define USB_ENDPOINT_ATH9K_BULK_IN_ADDRESS (2 | USB_DIR_IN) -define USB_ENDPOINT_ATH9K_INT_IN_ADDRESS (3 | USB_DIR_IN) -define USB_ENDPOINT_ATH9K_INT_OUT_ADDRESS (4) -define USB_ENDPOINT_ATH9K_BULK_EXTRA1_ADDRESS (5) -define USB_ENDPOINT_ATH9K_BULK_EXTRA2_ADDRESS (6) - define USB_ENDPOINT_ATH9K_BULK_ATTRIBUTES (USB_ENDPOINT_XFER_BULK) define USB_ENDPOINT_ATH9K_INT_ATTRIBUTES (USB_ENDPOINT_XFER_INT) |