From f27c4411ef465f3cc8c1615ed7e90d522314ac66 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 9 Jul 2019 15:09:02 -0700 Subject: sys/linux: update fs-verity descriptions The fs-verity API was redesigned, and we're planning to re-add the fs-verity patches to linux-next soon. Get the syzkaller descriptions up to date with the new API [1] [1] https://lkml.kernel.org/linux-fsdevel/20190701153237.1777-4-ebiggers@kernel.org --- sys/linux/fsverity.txt | 18 +++++++++++++++--- sys/linux/gen/386.go | 18 +++++++++++++++--- sys/linux/gen/amd64.go | 18 +++++++++++++++--- sys/linux/gen/arm.go | 18 +++++++++++++++--- sys/linux/gen/arm64.go | 18 +++++++++++++++--- sys/linux/gen/ppc64le.go | 18 +++++++++++++++--- 6 files changed, 90 insertions(+), 18 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/fsverity.txt b/sys/linux/fsverity.txt index eebeae09c..8505f09ed 100644 --- a/sys/linux/fsverity.txt +++ b/sys/linux/fsverity.txt @@ -4,13 +4,25 @@ include include -ioctl$FS_IOC_ENABLE_VERITY(fd fd, cmd const[FS_IOC_ENABLE_VERITY]) +ioctl$FS_IOC_ENABLE_VERITY(fd fd, cmd const[FS_IOC_ENABLE_VERITY], arg ptr[in, fsverity_enable_arg]) ioctl$FS_IOC_MEASURE_VERITY(fd fd, cmd const[FS_IOC_MEASURE_VERITY], arg ptr[inout, fsverity_digest]) -fsverity_digest_algorithm_flags = FS_VERITY_ALG_SHA256, FS_VERITY_ALG_SHA512, FS_VERITY_ALG_CRC32C +fsverity_hash_alg = FS_VERITY_HASH_ALG_SHA256, FS_VERITY_HASH_ALG_SHA512 + +fsverity_enable_arg { + version const[1, int32] + hash_algorithm flags[fsverity_hash_alg, int32] + block_size const[4096, int32] + salt_size len[salt_ptr, int32] + salt_ptr ptr64[in, array[int8]] + sig_size len[sig_ptr, int32] + reserved1 const[0, int32] + sig_ptr ptr64[in, array[int8]] + reserved2 array[const[0, int64], 11] +} fsverity_digest { - digest_algorithm flags[fsverity_digest_algorithm_flags, int16] + digest_algorithm flags[fsverity_hash_alg, int16] digest_size len[digest, int16] digest array[int8] } diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index 2b55f66d4..48a95977a 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -5882,10 +5882,21 @@ var structDescs_386 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "minlen", TypeSize: 8}}}, }}}, {Key: StructKey{Name: "fsverity_digest", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_digest", ArgDir: 2, IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_digest_algorithm_flags", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 3}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "digest_size", TypeSize: 2, ArgDir: 2}}, Path: []string{"digest"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "digest", ArgDir: 2, IsVarlen: true}}, }}}, + {Key: StructKey{Name: "fsverity_enable_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_enable_arg", TypeSize: 128}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 4}}, Val: 1}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "hash_algorithm", TypeSize: 4}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "block_size", TypeSize: 4}}, Val: 4096}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "salt_size", TypeSize: 4}}, Path: []string{"salt_ptr"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "salt_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "sig_size", TypeSize: 4}}, Path: []string{"sig_ptr"}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved1", TypeSize: 4}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "sig_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved2", TypeSize: 88}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 8}}}, Kind: 1, RangeBegin: 11, RangeEnd: 11}, + }}}, {Key: StructKey{Name: "fsxattr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsxattr", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_xflags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_extsize", TypeSize: 4}}}, @@ -33034,9 +33045,10 @@ var syscalls_386 = []*Syscall{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 2149057047}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "floppy_write_errors", Dir: 1}}}, }}, - {NR: 54, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", MissingArgs: 1, Args: []Type{ + {NR: 54, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 26245}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "fsverity_enable_arg"}}}, }}, {NR: 54, Name: "ioctl$FS_IOC_FIEMAP", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, @@ -51743,4 +51755,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "9a42283c92256065d22114d44928f6a36c084b64" +const revision_386 = "e6852411760a2a78058472eaf4813af2801ed202" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index ba4881a8c..15b6d9cab 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -5977,10 +5977,21 @@ var structDescs_amd64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "minlen", TypeSize: 8}}}, }}}, {Key: StructKey{Name: "fsverity_digest", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_digest", ArgDir: 2, IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_digest_algorithm_flags", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 3}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "digest_size", TypeSize: 2, ArgDir: 2}}, Path: []string{"digest"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "digest", ArgDir: 2, IsVarlen: true}}, }}}, + {Key: StructKey{Name: "fsverity_enable_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_enable_arg", TypeSize: 128}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 4}}, Val: 1}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "hash_algorithm", TypeSize: 4}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "block_size", TypeSize: 4}}, Val: 4096}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "salt_size", TypeSize: 4}}, Path: []string{"salt_ptr"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "salt_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "sig_size", TypeSize: 4}}, Path: []string{"sig_ptr"}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved1", TypeSize: 4}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "sig_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved2", TypeSize: 88}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 8}}}, Kind: 1, RangeBegin: 11, RangeEnd: 11}, + }}}, {Key: StructKey{Name: "fsxattr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsxattr", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_xflags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_extsize", TypeSize: 4}}}, @@ -33531,9 +33542,10 @@ var syscalls_amd64 = []*Syscall{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 2150105623}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "floppy_write_errors", Dir: 1}}}, }}, - {NR: 16, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", MissingArgs: 1, Args: []Type{ + {NR: 16, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 26245}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fsverity_enable_arg"}}}, }}, {NR: 16, Name: "ioctl$FS_IOC_FIEMAP", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, @@ -52280,4 +52292,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "a4801ceb9d57ce8364f243d1a24303b972f3438d" +const revision_amd64 = "dcbebec84b823ea25f3b394a09856311b9dd1ca0" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index b01bd75e7..91a29fe40 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -5882,10 +5882,21 @@ var structDescs_arm = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "minlen", TypeSize: 8}}}, }}}, {Key: StructKey{Name: "fsverity_digest", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_digest", ArgDir: 2, IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_digest_algorithm_flags", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 3}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "digest_size", TypeSize: 2, ArgDir: 2}}, Path: []string{"digest"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "digest", ArgDir: 2, IsVarlen: true}}, }}}, + {Key: StructKey{Name: "fsverity_enable_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_enable_arg", TypeSize: 128}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 4}}, Val: 1}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "hash_algorithm", TypeSize: 4}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "block_size", TypeSize: 4}}, Val: 4096}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "salt_size", TypeSize: 4}}, Path: []string{"salt_ptr"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "salt_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "sig_size", TypeSize: 4}}, Path: []string{"sig_ptr"}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved1", TypeSize: 4}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "sig_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved2", TypeSize: 88}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 8}}}, Kind: 1, RangeBegin: 11, RangeEnd: 11}, + }}}, {Key: StructKey{Name: "fsxattr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsxattr", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_xflags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_extsize", TypeSize: 4}}}, @@ -32843,9 +32854,10 @@ var syscalls_arm = []*Syscall{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 2149057047}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "floppy_write_errors", Dir: 1}}}, }}, - {NR: 54, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", MissingArgs: 1, Args: []Type{ + {NR: 54, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 26245}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "fsverity_enable_arg"}}}, }}, {NR: 54, Name: "ioctl$FS_IOC_FIEMAP", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, @@ -51320,4 +51332,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "c47f34c7b2cc61effa29674e10e1ad681c5140d1" +const revision_arm = "e1dc4882544d6442aef7732b455d7285ae1eb641" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 3bcb6dce7..cce9f6c90 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -5977,10 +5977,21 @@ var structDescs_arm64 = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "minlen", TypeSize: 8}}}, }}}, {Key: StructKey{Name: "fsverity_digest", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_digest", ArgDir: 2, IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_digest_algorithm_flags", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 3}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "digest_size", TypeSize: 2, ArgDir: 2}}, Path: []string{"digest"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "digest", ArgDir: 2, IsVarlen: true}}, }}}, + {Key: StructKey{Name: "fsverity_enable_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_enable_arg", TypeSize: 128}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 4}}, Val: 1}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "hash_algorithm", TypeSize: 4}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "block_size", TypeSize: 4}}, Val: 4096}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "salt_size", TypeSize: 4}}, Path: []string{"salt_ptr"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "salt_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "sig_size", TypeSize: 4}}, Path: []string{"sig_ptr"}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved1", TypeSize: 4}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "sig_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved2", TypeSize: 88}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 8}}}, Kind: 1, RangeBegin: 11, RangeEnd: 11}, + }}}, {Key: StructKey{Name: "fsxattr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsxattr", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_xflags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_extsize", TypeSize: 4}}}, @@ -33243,9 +33254,10 @@ var syscalls_arm64 = []*Syscall{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 2150105623}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "floppy_write_errors", Dir: 1}}}, }}, - {NR: 29, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", MissingArgs: 1, Args: []Type{ + {NR: 29, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 26245}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fsverity_enable_arg"}}}, }}, {NR: 29, Name: "ioctl$FS_IOC_FIEMAP", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, @@ -51632,4 +51644,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "f6583952a79dd3ec3be21651f9c1cf9486c03991" +const revision_arm64 = "d2380e739438289715ad5793155eba1a5ec89c5b" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index a9f550b0e..3a2cd7175 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -5976,10 +5976,21 @@ var structDescs_ppc64le = []*KeyedStruct{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "minlen", TypeSize: 8}}}, }}}, {Key: StructKey{Name: "fsverity_digest", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_digest", ArgDir: 2, IsVarlen: true}, Fields: []Type{ - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_digest_algorithm_flags", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}, Vals: []uint64{1, 2, 3}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "digest_algorithm", TypeSize: 2, ArgDir: 2}}}, &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "digest_size", TypeSize: 2, ArgDir: 2}}, Path: []string{"digest"}}, &BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "digest", ArgDir: 2, IsVarlen: true}}, }}}, + {Key: StructKey{Name: "fsverity_enable_arg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsverity_enable_arg", TypeSize: 128}, Fields: []Type{ + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "version", TypeSize: 4}}, Val: 1}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fsverity_hash_alg", FldName: "hash_algorithm", TypeSize: 4}}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "block_size", TypeSize: 4}}, Val: 4096}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "salt_size", TypeSize: 4}}, Path: []string{"salt_ptr"}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "salt_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "sig_size", TypeSize: 4}}, Path: []string{"sig_ptr"}}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "reserved1", TypeSize: 4}}}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "sig_ptr", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}}}, + &ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "reserved2", TypeSize: 88}, Type: &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", TypeSize: 8}}}, Kind: 1, RangeBegin: 11, RangeEnd: 11}, + }}}, {Key: StructKey{Name: "fsxattr"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fsxattr", TypeSize: 32}, Fields: []Type{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_xflags", TypeSize: 4}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", FldName: "fsx_extsize", TypeSize: 4}}}, @@ -33184,9 +33195,10 @@ var syscalls_ppc64le = []*Syscall{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 1076363799}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "floppy_write_errors", Dir: 1}}}, }}, - {NR: 54, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", MissingArgs: 1, Args: []Type{ + {NR: 54, Name: "ioctl$FS_IOC_ENABLE_VERITY", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 536897157}, + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fsverity_enable_arg"}}}, }}, {NR: 54, Name: "ioctl$FS_IOC_FIEMAP", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "fd", TypeSize: 4}}, @@ -51597,4 +51609,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "c6530d639de766f9c3886622e86e07f0aafbf126" +const revision_ppc64le = "3c6f9896b7cb868b391014be969a0359572922f5" -- cgit mrf-deployment