From 1ea952c9ffd767584c60a91d6f6d8ca603817c50 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 16 Mar 2020 08:14:39 +0100 Subject: pkg/compiler: calculate more precise sizes for arguments If we have: ioctl(fd fd, cmd int32) ioctl$FOO(fd fd, cmd const[FOO]) Currently we assume that cmd size in ioctl$FOO is sizeof(void*). However, we know that in ioctl it's specified as int32, so we can infer that the actual syscall size is 4. This massively reduces sizes of socket/setsockopt/getsockopt/ioctl and some other syscalls, which is good because we now use physical size in mutation/hints and some other places. This will also enable not morphing ioctl's into other ioctl's. Update #477 Update #502 --- sys/test/gen/32_fork_shmem.go | 38 +++++++++++++++++++------------------- sys/test/gen/32_shmem.go | 38 +++++++++++++++++++------------------- sys/test/gen/64.go | 42 +++++++++++++++++++++--------------------- sys/test/gen/64_fork.go | 42 +++++++++++++++++++++--------------------- 4 files changed, 80 insertions(+), 80 deletions(-) (limited to 'sys/test') diff --git a/sys/test/gen/32_fork_shmem.go b/sys/test/gen/32_fork_shmem.go index 552e023b3..93c79568f 100644 --- a/sys/test/gen/32_fork_shmem.go +++ b/sys/test/gen/32_fork_shmem.go @@ -1138,7 +1138,7 @@ var syscalls_32_fork_shmem = []*Syscall{ {Name: "test$auto0", CallName: "test", MissingArgs: 2, Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "a", TypeSize: 4}}, Val: 66}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "b", TypeSize: 4}, &StructType{Key: StructKey{Name: "auto_struct0"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 4}}, Path: []string{"b"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 2}}, Path: []string{"b"}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d", TypeSize: 4}}}, }}, {Name: "test$bf0", CallName: "test", MissingArgs: 5, Args: []Type{ @@ -1198,18 +1198,18 @@ var syscalls_32_fork_shmem = []*Syscall{ }}, {Name: "test$length10", CallName: "test", MissingArgs: 1, Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 4}}, BitSize: 8, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 2}}, BitSize: 8, Path: []string{"a0"}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 4}}, BitSize: 16, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 4}}, BitSize: 32, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 8}}, BitSize: 32, Path: []string{"a0"}}, }}, {Name: "test$length11", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length12", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4, IsOptional: true}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length13", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{"syz_length_large_struct", 2}}}, @@ -1239,11 +1239,11 @@ var syscalls_32_fork_shmem = []*Syscall{ }}, {Name: "test$length21", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 4}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length22", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 4}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length23", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "len_templ1[int8, int16]"}}}, @@ -1253,19 +1253,19 @@ var syscalls_32_fork_shmem = []*Syscall{ }}, {Name: "test$length25", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length26", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "len_unaligned"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 4}}, BitSize: 8, Path: []string{"a"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 1}}, BitSize: 8, Path: []string{"a"}}, }}, {Name: "test$length27", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{Name: "explicitly_sized"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length28", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &UnionType{Key: StructKey{Name: "explicitly_sized_union"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length29", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "static_filename"}}}, @@ -1275,7 +1275,7 @@ var syscalls_32_fork_shmem = []*Syscall{ }}, {Name: "test$length30", CallName: "test", MissingArgs: 2, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{Name: "len_expr1"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 1}}, BitSize: 8, Path: []string{"a0", "f11"}}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "a2", TypeSize: 4}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a3", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21", "f31"}}, }}, @@ -1362,19 +1362,19 @@ var syscalls_32_fork_shmem = []*Syscall{ }}, {Name: "test$text_x86_16", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 2}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_32", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 3}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_64", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_real", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 1}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$type_confusion1", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 4}, &UnionType{Key: StructKey{Name: "type_confusion"}}}, @@ -1390,7 +1390,7 @@ var syscalls_32_fork_shmem = []*Syscall{ }}, {Name: "test$vma0", CallName: "test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v0", TypeSize: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 4}}, Path: []string{"v0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 1}}, Path: []string{"v0"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v1", TypeSize: 4}, 5, 5}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l1", TypeSize: 4}}, Path: []string{"v1"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v2", TypeSize: 4}, 7, 9}, @@ -1450,4 +1450,4 @@ var consts_32_fork_shmem = []ConstValue{ {Name: "SYS_unsupported"}, } -const revision_32_fork_shmem = "9de9df2edf17935a28af03116105b78e58013838" +const revision_32_fork_shmem = "8b0c7eb98cd401cc01c2beb956ae849009a1d2d1" diff --git a/sys/test/gen/32_shmem.go b/sys/test/gen/32_shmem.go index 317beea70..df49539b0 100644 --- a/sys/test/gen/32_shmem.go +++ b/sys/test/gen/32_shmem.go @@ -1132,7 +1132,7 @@ var syscalls_32_shmem = []*Syscall{ {Name: "test$auto0", CallName: "test", MissingArgs: 2, Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "a", TypeSize: 4}}, Val: 66}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "b", TypeSize: 4}, &StructType{Key: StructKey{Name: "auto_struct0"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 4}}, Path: []string{"b"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 2}}, Path: []string{"b"}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d", TypeSize: 4}}}, }}, {Name: "test$bf0", CallName: "test", MissingArgs: 5, Args: []Type{ @@ -1192,18 +1192,18 @@ var syscalls_32_shmem = []*Syscall{ }}, {Name: "test$length10", CallName: "test", MissingArgs: 1, Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 4}}, BitSize: 8, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 2}}, BitSize: 8, Path: []string{"a0"}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 4}}, BitSize: 16, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 4}}, BitSize: 32, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 8}}, BitSize: 32, Path: []string{"a0"}}, }}, {Name: "test$length11", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length12", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4, IsOptional: true}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length13", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{"syz_length_large_struct", 2}}}, @@ -1233,11 +1233,11 @@ var syscalls_32_shmem = []*Syscall{ }}, {Name: "test$length21", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 4}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length22", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 4}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length23", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "len_templ1[int8, int16]"}}}, @@ -1247,19 +1247,19 @@ var syscalls_32_shmem = []*Syscall{ }}, {Name: "test$length25", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length26", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "len_unaligned"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 4}}, BitSize: 8, Path: []string{"a"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 1}}, BitSize: 8, Path: []string{"a"}}, }}, {Name: "test$length27", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{Name: "explicitly_sized"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length28", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &UnionType{Key: StructKey{Name: "explicitly_sized_union"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length29", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 4}, &StructType{Key: StructKey{Name: "static_filename"}}}, @@ -1269,7 +1269,7 @@ var syscalls_32_shmem = []*Syscall{ }}, {Name: "test$length30", CallName: "test", MissingArgs: 2, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &StructType{Key: StructKey{Name: "len_expr1"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 1}}, BitSize: 8, Path: []string{"a0", "f11"}}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "a2", TypeSize: 4}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21"}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a3", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21", "f31"}}, }}, @@ -1356,19 +1356,19 @@ var syscalls_32_shmem = []*Syscall{ }}, {Name: "test$text_x86_16", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 2}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_32", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 3}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_64", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_real", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 4}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 1}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 4}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$type_confusion1", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 4}, &UnionType{Key: StructKey{Name: "type_confusion"}}}, @@ -1384,7 +1384,7 @@ var syscalls_32_shmem = []*Syscall{ }}, {Name: "test$vma0", CallName: "test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v0", TypeSize: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 4}}, Path: []string{"v0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 1}}, Path: []string{"v0"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v1", TypeSize: 4}, 5, 5}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l1", TypeSize: 4}}, Path: []string{"v1"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v2", TypeSize: 4}, 7, 9}, @@ -1444,4 +1444,4 @@ var consts_32_shmem = []ConstValue{ {Name: "SYS_unsupported"}, } -const revision_32_shmem = "b3b0c6ea907ce870e7e4b25b9308c2425d0e8cf3" +const revision_32_shmem = "be5d972f8dc2b75e7dc9f6626863df04f26fe121" diff --git a/sys/test/gen/64.go b/sys/test/gen/64.go index 8f5ff9cd3..c7c452e7e 100644 --- a/sys/test/gen/64.go +++ b/sys/test/gen/64.go @@ -1142,7 +1142,7 @@ var syscalls_64 = []*Syscall{ {Name: "test$auto0", CallName: "test", MissingArgs: 2, Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "a", TypeSize: 8}}, Val: 66}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "b", TypeSize: 8}, &StructType{Key: StructKey{Name: "auto_struct0"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 8}}, Path: []string{"b"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 2}}, Path: []string{"b"}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d", TypeSize: 4}}}, }}, {Name: "test$bf0", CallName: "test", MissingArgs: 5, Args: []Type{ @@ -1202,18 +1202,18 @@ var syscalls_64 = []*Syscall{ }}, {Name: "test$length10", CallName: "test", MissingArgs: 1, Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 8}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 8}}, BitSize: 8, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 8}}, BitSize: 16, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 2}}, BitSize: 8, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 4}}, BitSize: 16, Path: []string{"a0"}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 8}}, BitSize: 32, Path: []string{"a0"}}, }}, {Name: "test$length11", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length12", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8, IsOptional: true}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length13", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{"syz_length_large_struct", 2}}}, @@ -1243,11 +1243,11 @@ var syscalls_64 = []*Syscall{ }}, {Name: "test$length21", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 8}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length22", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 8}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length23", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "len_templ1[int8, int16]"}}}, @@ -1257,19 +1257,19 @@ var syscalls_64 = []*Syscall{ }}, {Name: "test$length25", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length26", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "len_unaligned"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 8}}, BitSize: 8, Path: []string{"a"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 1}}, BitSize: 8, Path: []string{"a"}}, }}, {Name: "test$length27", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "explicitly_sized"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length28", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &UnionType{Key: StructKey{Name: "explicitly_sized_union"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length29", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "static_filename"}}}, @@ -1279,9 +1279,9 @@ var syscalls_64 = []*Syscall{ }}, {Name: "test$length30", CallName: "test", MissingArgs: 2, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "len_expr1"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 8}}, BitSize: 8, Path: []string{"a0", "f11"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 1}}, BitSize: 8, Path: []string{"a0", "f11"}}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "a2", TypeSize: 8}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a3", TypeSize: 8}}, BitSize: 8, Path: []string{"a0", "f11", "f21", "f31"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a3", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21", "f31"}}, }}, {Name: "test$length4", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "syz_length_len2_struct"}}}, @@ -1366,19 +1366,19 @@ var syscalls_64 = []*Syscall{ }}, {Name: "test$text_x86_16", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 2}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_32", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 3}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_64", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_real", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 1}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$type_confusion1", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 8}, &UnionType{Key: StructKey{Name: "type_confusion"}}}, @@ -1394,9 +1394,9 @@ var syscalls_64 = []*Syscall{ }}, {Name: "test$vma0", CallName: "test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v0", TypeSize: 8}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 8}}, Path: []string{"v0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 1}}, Path: []string{"v0"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v1", TypeSize: 8}, 5, 5}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l1", TypeSize: 8}}, Path: []string{"v1"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l1", TypeSize: 4}}, Path: []string{"v1"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v2", TypeSize: 8}, 7, 9}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l2", TypeSize: 8}}, Path: []string{"v2"}}, }}, @@ -1454,4 +1454,4 @@ var consts_64 = []ConstValue{ {Name: "SYS_unsupported"}, } -const revision_64 = "f21fe2c3f1b0e63ded6b9ee4a51a36aa1f8b5dc0" +const revision_64 = "36186e96efde25631acd856e90c680222ac62c9f" diff --git a/sys/test/gen/64_fork.go b/sys/test/gen/64_fork.go index 60bdd3c02..d2c9437dd 100644 --- a/sys/test/gen/64_fork.go +++ b/sys/test/gen/64_fork.go @@ -1139,7 +1139,7 @@ var syscalls_64_fork = []*Syscall{ {Name: "test$auto0", CallName: "test", MissingArgs: 2, Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "a", TypeSize: 8}}, Val: 66}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "b", TypeSize: 8}, &StructType{Key: StructKey{Name: "auto_struct0"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 8}}, Path: []string{"b"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "c", TypeSize: 2}}, Path: []string{"b"}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "d", TypeSize: 4}}}, }}, {Name: "test$bf0", CallName: "test", MissingArgs: 5, Args: []Type{ @@ -1199,18 +1199,18 @@ var syscalls_64_fork = []*Syscall{ }}, {Name: "test$length10", CallName: "test", MissingArgs: 1, Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "a0", TypeSize: 8}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 8}}, BitSize: 8, Path: []string{"a0"}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 8}}, BitSize: 16, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a2", TypeSize: 2}}, BitSize: 8, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize2", FldName: "a3", TypeSize: 4}}, BitSize: 16, Path: []string{"a0"}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize4", FldName: "a4", TypeSize: 8}}, BitSize: 32, Path: []string{"a0"}}, }}, {Name: "test$length11", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length12", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8, IsOptional: true}, &StructType{Key: StructKey{Name: "syz_length_large_struct"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length13", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{"syz_length_large_struct", 2}}}, @@ -1240,11 +1240,11 @@ var syscalls_64_fork = []*Syscall{ }}, {Name: "test$length21", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", TypeSize: 8}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 8}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length22", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 8}}, BitSize: 1, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bitsize", FldName: "a1", TypeSize: 1}}, BitSize: 1, Path: []string{"a0"}}, }}, {Name: "test$length23", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "len_templ1[int8, int16]"}}}, @@ -1254,19 +1254,19 @@ var syscalls_64_fork = []*Syscall{ }}, {Name: "test$length25", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length26", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "len_unaligned"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 8}}, BitSize: 8, Path: []string{"a"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "b", TypeSize: 1}}, BitSize: 8, Path: []string{"a"}}, }}, {Name: "test$length27", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "explicitly_sized"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length28", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &UnionType{Key: StructKey{Name: "explicitly_sized_union"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$length29", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a", TypeSize: 8}, &StructType{Key: StructKey{Name: "static_filename"}}}, @@ -1276,9 +1276,9 @@ var syscalls_64_fork = []*Syscall{ }}, {Name: "test$length30", CallName: "test", MissingArgs: 2, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "len_expr1"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 8}}, BitSize: 8, Path: []string{"a0", "f11"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a1", TypeSize: 1}}, BitSize: 8, Path: []string{"a0", "f11"}}, &PtrType{TypeCommon{TypeName: "ptr", FldName: "a2", TypeSize: 8}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21"}}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a3", TypeSize: 8}}, BitSize: 8, Path: []string{"a0", "f11", "f21", "f31"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "bytesize", FldName: "a3", TypeSize: 4}}, BitSize: 8, Path: []string{"a0", "f11", "f21", "f31"}}, }}, {Name: "test$length4", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &StructType{Key: StructKey{Name: "syz_length_len2_struct"}}}, @@ -1363,19 +1363,19 @@ var syscalls_64_fork = []*Syscall{ }}, {Name: "test$text_x86_16", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 2}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_32", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 3}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_64", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 4}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$text_x86_real", CallName: "test", MissingArgs: 4, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a0", TypeSize: 8}, &BufferType{TypeCommon: TypeCommon{TypeName: "text", IsVarlen: true}, Kind: 4, Text: 1}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 8}}, Path: []string{"a0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "a1", TypeSize: 1}}, Path: []string{"a0"}}, }}, {Name: "test$type_confusion1", CallName: "test", MissingArgs: 5, Args: []Type{ &PtrType{TypeCommon{TypeName: "ptr", FldName: "a1", TypeSize: 8}, &UnionType{Key: StructKey{Name: "type_confusion"}}}, @@ -1391,9 +1391,9 @@ var syscalls_64_fork = []*Syscall{ }}, {Name: "test$vma0", CallName: "test", Args: []Type{ &VmaType{TypeCommon: TypeCommon{TypeName: "vma", FldName: "v0", TypeSize: 8}}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 8}}, Path: []string{"v0"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l0", TypeSize: 1}}, Path: []string{"v0"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v1", TypeSize: 8}, 5, 5}, - &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l1", TypeSize: 8}}, Path: []string{"v1"}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l1", TypeSize: 4}}, Path: []string{"v1"}}, &VmaType{TypeCommon{TypeName: "vma", FldName: "v2", TypeSize: 8}, 7, 9}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "l2", TypeSize: 8}}, Path: []string{"v2"}}, }}, @@ -1450,4 +1450,4 @@ var consts_64_fork = []ConstValue{ {Name: "SYS_unsupported"}, } -const revision_64_fork = "647e31ffe8e7096502c33d49da123323314ec0da" +const revision_64_fork = "610b24588703473caa36384b1c2f57f4ac0c7c5f" -- cgit mrf-deployment