From 8ddccc2581d2f66a05bb78371e32c6f0f85e1521 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Thu, 11 Jun 2020 00:17:05 +0200 Subject: sys/linux: rename fsverity.txt to fs_ioctl_fsverity.txt --- sys/linux/fs_ioctl_fsverity.txt | 28 ++++++++++++++++++++++++++++ sys/linux/fs_ioctl_fsverity_386.const | 6 ++++++ sys/linux/fs_ioctl_fsverity_amd64.const | 6 ++++++ sys/linux/fs_ioctl_fsverity_arm.const | 6 ++++++ sys/linux/fs_ioctl_fsverity_arm64.const | 6 ++++++ sys/linux/fs_ioctl_fsverity_mips64le.const | 6 ++++++ sys/linux/fs_ioctl_fsverity_ppc64le.const | 6 ++++++ sys/linux/fsverity.txt | 28 ---------------------------- sys/linux/fsverity_386.const | 6 ------ sys/linux/fsverity_amd64.const | 6 ------ sys/linux/fsverity_arm.const | 6 ------ sys/linux/fsverity_arm64.const | 6 ------ sys/linux/fsverity_mips64le.const | 6 ------ sys/linux/fsverity_ppc64le.const | 6 ------ 14 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 sys/linux/fs_ioctl_fsverity.txt create mode 100644 sys/linux/fs_ioctl_fsverity_386.const create mode 100644 sys/linux/fs_ioctl_fsverity_amd64.const create mode 100644 sys/linux/fs_ioctl_fsverity_arm.const create mode 100644 sys/linux/fs_ioctl_fsverity_arm64.const create mode 100644 sys/linux/fs_ioctl_fsverity_mips64le.const create mode 100644 sys/linux/fs_ioctl_fsverity_ppc64le.const delete mode 100644 sys/linux/fsverity.txt delete mode 100644 sys/linux/fsverity_386.const delete mode 100644 sys/linux/fsverity_amd64.const delete mode 100644 sys/linux/fsverity_arm.const delete mode 100644 sys/linux/fsverity_arm64.const delete mode 100644 sys/linux/fsverity_mips64le.const delete mode 100644 sys/linux/fsverity_ppc64le.const (limited to 'sys/linux') diff --git a/sys/linux/fs_ioctl_fsverity.txt b/sys/linux/fs_ioctl_fsverity.txt new file mode 100644 index 000000000..8505f09ed --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity.txt @@ -0,0 +1,28 @@ +# Copyright 2019 syzkaller project authors. All rights reserved. +# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +include +include + +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_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_hash_alg, int16] + digest_size len[digest, int16] + digest array[int8] +} diff --git a/sys/linux/fs_ioctl_fsverity_386.const b/sys/linux/fs_ioctl_fsverity_386.const new file mode 100644 index 000000000..85dca7d42 --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity_386.const @@ -0,0 +1,6 @@ +# AUTOGENERATED FILE +FS_IOC_ENABLE_VERITY = 1082156677 +FS_IOC_MEASURE_VERITY = 3221513862 +FS_VERITY_HASH_ALG_SHA256 = 1 +FS_VERITY_HASH_ALG_SHA512 = 2 +__NR_ioctl = 54 diff --git a/sys/linux/fs_ioctl_fsverity_amd64.const b/sys/linux/fs_ioctl_fsverity_amd64.const new file mode 100644 index 000000000..febb162da --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity_amd64.const @@ -0,0 +1,6 @@ +# AUTOGENERATED FILE +FS_IOC_ENABLE_VERITY = 1082156677 +FS_IOC_MEASURE_VERITY = 3221513862 +FS_VERITY_HASH_ALG_SHA256 = 1 +FS_VERITY_HASH_ALG_SHA512 = 2 +__NR_ioctl = 16 diff --git a/sys/linux/fs_ioctl_fsverity_arm.const b/sys/linux/fs_ioctl_fsverity_arm.const new file mode 100644 index 000000000..85dca7d42 --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity_arm.const @@ -0,0 +1,6 @@ +# AUTOGENERATED FILE +FS_IOC_ENABLE_VERITY = 1082156677 +FS_IOC_MEASURE_VERITY = 3221513862 +FS_VERITY_HASH_ALG_SHA256 = 1 +FS_VERITY_HASH_ALG_SHA512 = 2 +__NR_ioctl = 54 diff --git a/sys/linux/fs_ioctl_fsverity_arm64.const b/sys/linux/fs_ioctl_fsverity_arm64.const new file mode 100644 index 000000000..693d8dc7b --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity_arm64.const @@ -0,0 +1,6 @@ +# AUTOGENERATED FILE +FS_IOC_ENABLE_VERITY = 1082156677 +FS_IOC_MEASURE_VERITY = 3221513862 +FS_VERITY_HASH_ALG_SHA256 = 1 +FS_VERITY_HASH_ALG_SHA512 = 2 +__NR_ioctl = 29 diff --git a/sys/linux/fs_ioctl_fsverity_mips64le.const b/sys/linux/fs_ioctl_fsverity_mips64le.const new file mode 100644 index 000000000..40af1230f --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity_mips64le.const @@ -0,0 +1,6 @@ +# AUTOGENERATED FILE +FS_IOC_ENABLE_VERITY = 2155898501 +FS_IOC_MEASURE_VERITY = 3221513862 +FS_VERITY_HASH_ALG_SHA256 = 1 +FS_VERITY_HASH_ALG_SHA512 = 2 +__NR_ioctl = 5015 diff --git a/sys/linux/fs_ioctl_fsverity_ppc64le.const b/sys/linux/fs_ioctl_fsverity_ppc64le.const new file mode 100644 index 000000000..b29096383 --- /dev/null +++ b/sys/linux/fs_ioctl_fsverity_ppc64le.const @@ -0,0 +1,6 @@ +# AUTOGENERATED FILE +FS_IOC_ENABLE_VERITY = 2155898501 +FS_IOC_MEASURE_VERITY = 3221513862 +FS_VERITY_HASH_ALG_SHA256 = 1 +FS_VERITY_HASH_ALG_SHA512 = 2 +__NR_ioctl = 54 diff --git a/sys/linux/fsverity.txt b/sys/linux/fsverity.txt deleted file mode 100644 index 8505f09ed..000000000 --- a/sys/linux/fsverity.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2019 syzkaller project authors. All rights reserved. -# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -include -include - -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_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_hash_alg, int16] - digest_size len[digest, int16] - digest array[int8] -} diff --git a/sys/linux/fsverity_386.const b/sys/linux/fsverity_386.const deleted file mode 100644 index 85dca7d42..000000000 --- a/sys/linux/fsverity_386.const +++ /dev/null @@ -1,6 +0,0 @@ -# AUTOGENERATED FILE -FS_IOC_ENABLE_VERITY = 1082156677 -FS_IOC_MEASURE_VERITY = 3221513862 -FS_VERITY_HASH_ALG_SHA256 = 1 -FS_VERITY_HASH_ALG_SHA512 = 2 -__NR_ioctl = 54 diff --git a/sys/linux/fsverity_amd64.const b/sys/linux/fsverity_amd64.const deleted file mode 100644 index febb162da..000000000 --- a/sys/linux/fsverity_amd64.const +++ /dev/null @@ -1,6 +0,0 @@ -# AUTOGENERATED FILE -FS_IOC_ENABLE_VERITY = 1082156677 -FS_IOC_MEASURE_VERITY = 3221513862 -FS_VERITY_HASH_ALG_SHA256 = 1 -FS_VERITY_HASH_ALG_SHA512 = 2 -__NR_ioctl = 16 diff --git a/sys/linux/fsverity_arm.const b/sys/linux/fsverity_arm.const deleted file mode 100644 index 85dca7d42..000000000 --- a/sys/linux/fsverity_arm.const +++ /dev/null @@ -1,6 +0,0 @@ -# AUTOGENERATED FILE -FS_IOC_ENABLE_VERITY = 1082156677 -FS_IOC_MEASURE_VERITY = 3221513862 -FS_VERITY_HASH_ALG_SHA256 = 1 -FS_VERITY_HASH_ALG_SHA512 = 2 -__NR_ioctl = 54 diff --git a/sys/linux/fsverity_arm64.const b/sys/linux/fsverity_arm64.const deleted file mode 100644 index 693d8dc7b..000000000 --- a/sys/linux/fsverity_arm64.const +++ /dev/null @@ -1,6 +0,0 @@ -# AUTOGENERATED FILE -FS_IOC_ENABLE_VERITY = 1082156677 -FS_IOC_MEASURE_VERITY = 3221513862 -FS_VERITY_HASH_ALG_SHA256 = 1 -FS_VERITY_HASH_ALG_SHA512 = 2 -__NR_ioctl = 29 diff --git a/sys/linux/fsverity_mips64le.const b/sys/linux/fsverity_mips64le.const deleted file mode 100644 index 40af1230f..000000000 --- a/sys/linux/fsverity_mips64le.const +++ /dev/null @@ -1,6 +0,0 @@ -# AUTOGENERATED FILE -FS_IOC_ENABLE_VERITY = 2155898501 -FS_IOC_MEASURE_VERITY = 3221513862 -FS_VERITY_HASH_ALG_SHA256 = 1 -FS_VERITY_HASH_ALG_SHA512 = 2 -__NR_ioctl = 5015 diff --git a/sys/linux/fsverity_ppc64le.const b/sys/linux/fsverity_ppc64le.const deleted file mode 100644 index b29096383..000000000 --- a/sys/linux/fsverity_ppc64le.const +++ /dev/null @@ -1,6 +0,0 @@ -# AUTOGENERATED FILE -FS_IOC_ENABLE_VERITY = 2155898501 -FS_IOC_MEASURE_VERITY = 3221513862 -FS_VERITY_HASH_ALG_SHA256 = 1 -FS_VERITY_HASH_ALG_SHA512 = 2 -__NR_ioctl = 54 -- cgit mrf-deployment