From ad6aec41937e43270e025078d447961bb2c14a79 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 29 Nov 2019 14:47:22 +0100 Subject: sys/linux: fix NFC_SOCKPROTO_RAW socket call It requires SOCK_SEQPACKET not SOCK_STREAM. --- sys/linux/gen/386.go | 4 ++-- sys/linux/gen/amd64.go | 4 ++-- sys/linux/gen/arm.go | 4 ++-- sys/linux/gen/arm64.go | 4 ++-- sys/linux/gen/ppc64le.go | 4 ++-- sys/linux/socket_nfc.txt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index a8e2b9fae..3c816c4b0 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -46228,7 +46228,7 @@ var syscalls_386 = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_llcp", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$nfc_raw", CallName: "syz_init_net_socket", Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 4}}, Val: 39}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 3}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{5, 3}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "proto", TypeSize: 4}}}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_raw", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$rose", CallName: "syz_init_net_socket", Args: []Type{ @@ -56181,4 +56181,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "7d46216b63fea880fffb849f01777b61986d6d92" +const revision_386 = "d2248922c03e180ee83dee69e3bd852045b85799" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index bca3ca93c..35af4d840 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -46768,7 +46768,7 @@ var syscalls_amd64 = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_llcp", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$nfc_raw", CallName: "syz_init_net_socket", Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 8}}, Val: 39}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{1, 3}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{5, 3}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "proto", TypeSize: 8}}}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_raw", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$rose", CallName: "syz_init_net_socket", Args: []Type{ @@ -56736,4 +56736,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "bf69a61cef4c21c42a7e53e7415223c4fc584adb" +const revision_amd64 = "cda5477f6b82bfc6591f586ae3e3dcc6c2218227" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index bef75f48b..0c6647e36 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -45884,7 +45884,7 @@ var syscalls_arm = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_llcp", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$nfc_raw", CallName: "syz_init_net_socket", Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 4}}, Val: 39}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{1, 3}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 4}}, Vals: []uint64{5, 3}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "proto", TypeSize: 4}}}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_raw", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$rose", CallName: "syz_init_net_socket", Args: []Type{ @@ -55758,4 +55758,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "488edca229b973af7ed54f9f619208c4c7dee990" +const revision_arm = "e2b943aa4150d382deb5b70e0335216bb084dc87" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 8468d6395..674996fd5 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -46244,7 +46244,7 @@ var syscalls_arm64 = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_llcp", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$nfc_raw", CallName: "syz_init_net_socket", Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 8}}, Val: 39}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{1, 3}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{5, 3}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "proto", TypeSize: 8}}}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_raw", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$rose", CallName: "syz_init_net_socket", Args: []Type{ @@ -56082,4 +56082,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "bd2c8e8cb22d9c7cc8c60cf055d7fb4b98d2b19b" +const revision_arm64 = "98262c3c28e28c0bddc9bfe7c1f492e6bf25da64" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index 4c6cf6809..25b358480 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -46217,7 +46217,7 @@ var syscalls_ppc64le = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_llcp", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$nfc_raw", CallName: "syz_init_net_socket", Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 8}}, Val: 39}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{1, 3}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "nfc_raw_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{5, 3}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "proto", TypeSize: 8}}}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_nfc_raw", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_init_net_socket$rose", CallName: "syz_init_net_socket", Args: []Type{ @@ -56053,4 +56053,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "a094a0af27f13f900b78743d0cda07e922f06931" +const revision_ppc64le = "918a7f7dd897024e034ba11d03ffd2769ebce1c7" diff --git a/sys/linux/socket_nfc.txt b/sys/linux/socket_nfc.txt index 4dbbbf549..569dc5c21 100644 --- a/sys/linux/socket_nfc.txt +++ b/sys/linux/socket_nfc.txt @@ -26,7 +26,7 @@ syz_init_net_socket$nfc_raw(domain const[AF_NFC], type flags[nfc_raw_type], prot connect$nfc_raw(fd sock_nfc_raw, addr ptr[in, sockaddr_nfc], addrlen len[addr]) nfc_llcp_type = SOCK_STREAM, SOCK_DGRAM, SOCK_RAW -nfc_raw_type = SOCK_STREAM, SOCK_RAW +nfc_raw_type = SOCK_SEQPACKET, SOCK_RAW nfc_proto = NFC_PROTO_JEWEL, NFC_PROTO_MIFARE, NFC_PROTO_FELICA, NFC_PROTO_ISO14443, NFC_PROTO_NFC_DEP, NFC_PROTO_ISO14443_B, NFC_PROTO_ISO15693 nfc_llcp_opts = NFC_LLCP_RW, NFC_LLCP_MIUX, NFC_LLCP_REMOTE_MIU, NFC_LLCP_REMOTE_LTO, NFC_LLCP_REMOTE_RW -- cgit mrf-deployment