From cccc4302d7da39e2fc41f9275442c267935632b7 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 26 Jun 2019 18:31:59 +0200 Subject: sys/linux, executor: run make extract and generate --- sys/linux/gen/386.go | 14 ++++++++++---- sys/linux/gen/amd64.go | 14 ++++++++++---- sys/linux/gen/arm.go | 14 ++++++++++---- sys/linux/gen/arm64.go | 14 ++++++++++---- sys/linux/gen/ppc64le.go | 14 ++++++++++---- sys/linux/vusb_386.const | 2 +- sys/linux/vusb_amd64.const | 2 +- sys/linux/vusb_arm.const | 2 +- sys/linux/vusb_arm64.const | 2 +- sys/linux/vusb_ppc64le.const | 2 +- 10 files changed, 55 insertions(+), 25 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 1097c660f..67a35bf9b 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -25498,7 +25498,7 @@ var structDescs_386 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, FldName: "inner"}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3}, @@ -25509,7 +25509,7 @@ var structDescs_386 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "extra", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "usb_endpoint_extra_descriptor"}}, Kind: 1, RangeEnd: 2}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}}, @@ -42896,6 +42896,12 @@ var syscalls_386 = []*Syscall{ {Name: "syz_usb_disconnect", CallName: "syz_usb_disconnect", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, }}, + {Name: "syz_usb_ep_read", CallName: "syz_usb_ep_read", Args: []Type{ + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 4}}, Path: []string{"data"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "data", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, + }}, {Name: "syz_usb_ep_write", CallName: "syz_usb_ep_write", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, @@ -49865,7 +49871,7 @@ var consts_386 = []ConstValue{ {Name: "USB_DT_DEVICE_SIZE", Value: 18}, {Name: "USB_DT_ENCRYPTION_TYPE", Value: 14}, {Name: "USB_DT_ENDPOINT", Value: 5}, - {Name: "USB_DT_ENDPOINT_SIZE", Value: 7}, + {Name: "USB_DT_ENDPOINT_AUDIO_SIZE", Value: 9}, {Name: "USB_DT_HUB", Value: 41}, {Name: "USB_DT_INTERFACE", Value: 4}, {Name: "USB_DT_INTERFACE_ASSOCIATION", Value: 11}, @@ -51719,4 +51725,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "15a9e1059c0119f9921a6dd0aa0410377868fcec" +const revision_386 = "519a941704236f17152699ef7577ed9251da786f" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index 0bcbae5ea..a8a748833 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -25869,7 +25869,7 @@ var structDescs_amd64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, FldName: "inner"}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3}, @@ -25880,7 +25880,7 @@ var structDescs_amd64 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "extra", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "usb_endpoint_extra_descriptor"}}, Kind: 1, RangeEnd: 2}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}}, @@ -43418,6 +43418,12 @@ var syscalls_amd64 = []*Syscall{ {Name: "syz_usb_disconnect", CallName: "syz_usb_disconnect", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, }}, + {Name: "syz_usb_ep_read", CallName: "syz_usb_ep_read", Args: []Type{ + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Path: []string{"data"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "data", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, + }}, {Name: "syz_usb_ep_write", CallName: "syz_usb_ep_write", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, @@ -50401,7 +50407,7 @@ var consts_amd64 = []ConstValue{ {Name: "USB_DT_DEVICE_SIZE", Value: 18}, {Name: "USB_DT_ENCRYPTION_TYPE", Value: 14}, {Name: "USB_DT_ENDPOINT", Value: 5}, - {Name: "USB_DT_ENDPOINT_SIZE", Value: 7}, + {Name: "USB_DT_ENDPOINT_AUDIO_SIZE", Value: 9}, {Name: "USB_DT_HUB", Value: 41}, {Name: "USB_DT_INTERFACE", Value: 4}, {Name: "USB_DT_INTERFACE_ASSOCIATION", Value: 11}, @@ -52256,4 +52262,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "748fe551f032fd1a4600c5de812e5a3ee2f12fe5" +const revision_amd64 = "dc711d6c1782cacc83730da773968ee6bfa6e1c9" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 54a1e9456..2f0ef0478 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -25320,7 +25320,7 @@ var structDescs_arm = []*KeyedStruct{ &StructType{Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, FldName: "inner"}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3}, @@ -25331,7 +25331,7 @@ var structDescs_arm = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "extra", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "usb_endpoint_extra_descriptor"}}, Kind: 1, RangeEnd: 2}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}}, @@ -42552,6 +42552,12 @@ var syscalls_arm = []*Syscall{ {Name: "syz_usb_disconnect", CallName: "syz_usb_disconnect", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, }}, + {Name: "syz_usb_ep_read", CallName: "syz_usb_ep_read", Args: []Type{ + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 4}}, Path: []string{"data"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "data", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, + }}, {Name: "syz_usb_ep_write", CallName: "syz_usb_ep_write", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, @@ -49452,7 +49458,7 @@ var consts_arm = []ConstValue{ {Name: "USB_DT_DEVICE_SIZE", Value: 18}, {Name: "USB_DT_ENCRYPTION_TYPE", Value: 14}, {Name: "USB_DT_ENDPOINT", Value: 5}, - {Name: "USB_DT_ENDPOINT_SIZE", Value: 7}, + {Name: "USB_DT_ENDPOINT_AUDIO_SIZE", Value: 9}, {Name: "USB_DT_HUB", Value: 41}, {Name: "USB_DT_INTERFACE", Value: 4}, {Name: "USB_DT_INTERFACE_ASSOCIATION", Value: 11}, @@ -51296,4 +51302,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "638001e76f27907626bfdd07109518a61f517c40" +const revision_arm = "6ba869e0323201b00a9f14cbf24407b0cfcfeb51" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 0e3d2d71a..24eb5f4cd 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -25686,7 +25686,7 @@ var structDescs_arm64 = []*KeyedStruct{ &StructType{Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, FldName: "inner"}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3}, @@ -25697,7 +25697,7 @@ var structDescs_arm64 = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "extra", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "usb_endpoint_extra_descriptor"}}, Kind: 1, RangeEnd: 2}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}}, @@ -42894,6 +42894,12 @@ var syscalls_arm64 = []*Syscall{ {Name: "syz_usb_disconnect", CallName: "syz_usb_disconnect", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, }}, + {Name: "syz_usb_ep_read", CallName: "syz_usb_ep_read", Args: []Type{ + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Path: []string{"data"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "data", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, + }}, {Name: "syz_usb_ep_write", CallName: "syz_usb_ep_write", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, @@ -49792,7 +49798,7 @@ var consts_arm64 = []ConstValue{ {Name: "USB_DT_DEVICE_SIZE", Value: 18}, {Name: "USB_DT_ENCRYPTION_TYPE", Value: 14}, {Name: "USB_DT_ENDPOINT", Value: 5}, - {Name: "USB_DT_ENDPOINT_SIZE", Value: 7}, + {Name: "USB_DT_ENDPOINT_AUDIO_SIZE", Value: 9}, {Name: "USB_DT_HUB", Value: 41}, {Name: "USB_DT_INTERFACE", Value: 4}, {Name: "USB_DT_INTERFACE_ASSOCIATION", Value: 11}, @@ -51606,4 +51612,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "07809266460e405a130f3ffa31d560bc87fea20f" +const revision_arm64 = "b21a45c75aa1ed547ed3f71caf5a0aec678d0666" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index 142da9dad..bf2cb4120 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -25556,7 +25556,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &StructType{Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, FldName: "inner"}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[const[USB_ENDPOINT_HID_ADDRESS, int8], const[USB_ENDPOINT_HID_ATTRIBUTES, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bEndpointAddress", TypeSize: 1}}, Val: 129}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bmAttributes", TypeSize: 1}}, Val: 3}, @@ -25567,7 +25567,7 @@ var structDescs_ppc64le = []*KeyedStruct{ &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "extra", IsVarlen: true}, Type: &UnionType{Key: StructKey{Name: "usb_endpoint_extra_descriptor"}}, Kind: 1, RangeEnd: 2}, }}}, {Key: StructKey{Name: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "usb_endpoint_descriptor_t[flags[usb_endpoint_addresses, int8], flags[usb_endpoint_attributes, int8], array[usb_endpoint_extra_descriptor, 0:2]]", IsVarlen: true}, Fields: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 7}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bLength", TypeSize: 1}}, Val: 9}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "bDescriptorType", TypeSize: 1}}, Val: 5}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_addresses", FldName: "bEndpointAddress", TypeSize: 1}}, Vals: []uint64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 128}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "usb_endpoint_attributes", FldName: "bmAttributes", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 3, 0, 16, 0, 4, 8, 12, 0, 16, 16}}, @@ -42867,6 +42867,12 @@ var syscalls_ppc64le = []*Syscall{ {Name: "syz_usb_disconnect", CallName: "syz_usb_disconnect", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, }}, + {Name: "syz_usb_ep_read", CallName: "syz_usb_ep_read", Args: []Type{ + &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Path: []string{"data"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "data", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}}, + }}, {Name: "syz_usb_ep_write", CallName: "syz_usb_ep_write", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_usb", FldName: "fd", TypeSize: 4}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16", FldName: "ep", TypeSize: 2}}, Kind: 2, RangeEnd: 31}, @@ -49767,7 +49773,7 @@ var consts_ppc64le = []ConstValue{ {Name: "USB_DT_DEVICE_SIZE", Value: 18}, {Name: "USB_DT_ENCRYPTION_TYPE", Value: 14}, {Name: "USB_DT_ENDPOINT", Value: 5}, - {Name: "USB_DT_ENDPOINT_SIZE", Value: 7}, + {Name: "USB_DT_ENDPOINT_AUDIO_SIZE", Value: 9}, {Name: "USB_DT_HUB", Value: 41}, {Name: "USB_DT_INTERFACE", Value: 4}, {Name: "USB_DT_INTERFACE_ASSOCIATION", Value: 11}, @@ -51573,4 +51579,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "da187a5c325188bfc6a1c7bd0381c52ce50415c1" +const revision_ppc64le = "b162f5cf7ce409d50e412b61883fbe10a40d934b" diff --git a/sys/linux/vusb_386.const b/sys/linux/vusb_386.const index 303fc602b..c639b46d0 100644 --- a/sys/linux/vusb_386.const +++ b/sys/linux/vusb_386.const @@ -103,7 +103,7 @@ USB_DT_DEVICE_QUALIFIER = 6 USB_DT_DEVICE_SIZE = 18 USB_DT_ENCRYPTION_TYPE = 14 USB_DT_ENDPOINT = 5 -USB_DT_ENDPOINT_SIZE = 7 +USB_DT_ENDPOINT_AUDIO_SIZE = 9 USB_DT_HUB = 41 USB_DT_INTERFACE = 4 USB_DT_INTERFACE_ASSOCIATION = 11 diff --git a/sys/linux/vusb_amd64.const b/sys/linux/vusb_amd64.const index 303fc602b..c639b46d0 100644 --- a/sys/linux/vusb_amd64.const +++ b/sys/linux/vusb_amd64.const @@ -103,7 +103,7 @@ USB_DT_DEVICE_QUALIFIER = 6 USB_DT_DEVICE_SIZE = 18 USB_DT_ENCRYPTION_TYPE = 14 USB_DT_ENDPOINT = 5 -USB_DT_ENDPOINT_SIZE = 7 +USB_DT_ENDPOINT_AUDIO_SIZE = 9 USB_DT_HUB = 41 USB_DT_INTERFACE = 4 USB_DT_INTERFACE_ASSOCIATION = 11 diff --git a/sys/linux/vusb_arm.const b/sys/linux/vusb_arm.const index 303fc602b..c639b46d0 100644 --- a/sys/linux/vusb_arm.const +++ b/sys/linux/vusb_arm.const @@ -103,7 +103,7 @@ USB_DT_DEVICE_QUALIFIER = 6 USB_DT_DEVICE_SIZE = 18 USB_DT_ENCRYPTION_TYPE = 14 USB_DT_ENDPOINT = 5 -USB_DT_ENDPOINT_SIZE = 7 +USB_DT_ENDPOINT_AUDIO_SIZE = 9 USB_DT_HUB = 41 USB_DT_INTERFACE = 4 USB_DT_INTERFACE_ASSOCIATION = 11 diff --git a/sys/linux/vusb_arm64.const b/sys/linux/vusb_arm64.const index 303fc602b..c639b46d0 100644 --- a/sys/linux/vusb_arm64.const +++ b/sys/linux/vusb_arm64.const @@ -103,7 +103,7 @@ USB_DT_DEVICE_QUALIFIER = 6 USB_DT_DEVICE_SIZE = 18 USB_DT_ENCRYPTION_TYPE = 14 USB_DT_ENDPOINT = 5 -USB_DT_ENDPOINT_SIZE = 7 +USB_DT_ENDPOINT_AUDIO_SIZE = 9 USB_DT_HUB = 41 USB_DT_INTERFACE = 4 USB_DT_INTERFACE_ASSOCIATION = 11 diff --git a/sys/linux/vusb_ppc64le.const b/sys/linux/vusb_ppc64le.const index 303fc602b..c639b46d0 100644 --- a/sys/linux/vusb_ppc64le.const +++ b/sys/linux/vusb_ppc64le.const @@ -103,7 +103,7 @@ USB_DT_DEVICE_QUALIFIER = 6 USB_DT_DEVICE_SIZE = 18 USB_DT_ENCRYPTION_TYPE = 14 USB_DT_ENDPOINT = 5 -USB_DT_ENDPOINT_SIZE = 7 +USB_DT_ENDPOINT_AUDIO_SIZE = 9 USB_DT_HUB = 41 USB_DT_INTERFACE = 4 USB_DT_INTERFACE_ASSOCIATION = 11 -- cgit mrf-deployment