From 4ece6be9e2e69f89ef011fe7647ec6efdfbe9df1 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Thu, 11 Jun 2020 00:21:03 +0200 Subject: sys/linux: rename watch_queue.txt to dev_watch_queue.txt --- sys/linux/dev_watch_queue.txt | 31 +++++++++++++++++++++++++++++++ sys/linux/dev_watch_queue_386.const | 9 +++++++++ sys/linux/dev_watch_queue_amd64.const | 9 +++++++++ sys/linux/dev_watch_queue_arm.const | 9 +++++++++ sys/linux/dev_watch_queue_arm64.const | 9 +++++++++ sys/linux/dev_watch_queue_mips64le.const | 9 +++++++++ sys/linux/dev_watch_queue_ppc64le.const | 9 +++++++++ sys/linux/watch_queue.txt | 31 ------------------------------- sys/linux/watch_queue_386.const | 9 --------- sys/linux/watch_queue_amd64.const | 9 --------- sys/linux/watch_queue_arm.const | 9 --------- sys/linux/watch_queue_arm64.const | 9 --------- sys/linux/watch_queue_mips64le.const | 9 --------- sys/linux/watch_queue_ppc64le.const | 9 --------- sys/syz-extract/extract.go | 2 +- 15 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 sys/linux/dev_watch_queue.txt create mode 100644 sys/linux/dev_watch_queue_386.const create mode 100644 sys/linux/dev_watch_queue_amd64.const create mode 100644 sys/linux/dev_watch_queue_arm.const create mode 100644 sys/linux/dev_watch_queue_arm64.const create mode 100644 sys/linux/dev_watch_queue_mips64le.const create mode 100644 sys/linux/dev_watch_queue_ppc64le.const delete mode 100644 sys/linux/watch_queue.txt delete mode 100644 sys/linux/watch_queue_386.const delete mode 100644 sys/linux/watch_queue_amd64.const delete mode 100644 sys/linux/watch_queue_arm.const delete mode 100644 sys/linux/watch_queue_arm64.const delete mode 100644 sys/linux/watch_queue_mips64le.const delete mode 100644 sys/linux/watch_queue_ppc64le.const (limited to 'sys') diff --git a/sys/linux/dev_watch_queue.txt b/sys/linux/dev_watch_queue.txt new file mode 100644 index 000000000..c414f184b --- /dev/null +++ b/sys/linux/dev_watch_queue.txt @@ -0,0 +1,31 @@ +# 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 +include + +resource fd_watch_queue[fd] + +openat$watch_queue(fd const[AT_FDCWD], file ptr[in, string["/dev/watch_queue"]], flags flags[open_flags], mode const[0]) fd_watch_queue +mmap$watch_queue(addr vma, len len[addr], prot flags[mmap_prot], flags flags[mmap_flags], fd fd_watch_queue, offset const[0]) +ioctl$IOC_WATCH_QUEUE_SET_SIZE(fd fd_watch_queue, cmd const[IOC_WATCH_QUEUE_SET_SIZE], arg flags[watch_queue_size]) +ioctl$IOC_WATCH_QUEUE_SET_FILTER(fd fd_watch_queue, cmd const[IOC_WATCH_QUEUE_SET_FILTER], arg ptr[in, watch_notification_filter]) + +watch_devices(watch_fd fd_watch_queue, watch_id intptr[-1:0xff], flags const[0]) + +watch_notification_filter { + nr_filters len[filters, int32] + __reserved const[0, int32] + filters array[watch_notification_type_filter] +} + +watch_notification_type_filter { + type int32 + info_filter int32 + info_mask int32 + subtype_filter array[int32, 8] +} + +watch_queue_size = 1, 2, 4, 8, 16 +_ = __NR_mmap2 diff --git a/sys/linux/dev_watch_queue_386.const b/sys/linux/dev_watch_queue_386.const new file mode 100644 index 000000000..90ac59cb3 --- /dev/null +++ b/sys/linux/dev_watch_queue_386.const @@ -0,0 +1,9 @@ +# AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 +IOC_WATCH_QUEUE_SET_FILTER = 22369 +IOC_WATCH_QUEUE_SET_SIZE = 22368 +__NR_ioctl = 54 +__NR_mmap = 192 +__NR_mmap2 = 192 +__NR_openat = 295 +__NR_watch_devices = 436 diff --git a/sys/linux/dev_watch_queue_amd64.const b/sys/linux/dev_watch_queue_amd64.const new file mode 100644 index 000000000..362ffd18a --- /dev/null +++ b/sys/linux/dev_watch_queue_amd64.const @@ -0,0 +1,9 @@ +# AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 +IOC_WATCH_QUEUE_SET_FILTER = 22369 +IOC_WATCH_QUEUE_SET_SIZE = 22368 +__NR_ioctl = 16 +__NR_mmap = 9 +# __NR_mmap2 is not set +__NR_openat = 257 +__NR_watch_devices = 436 diff --git a/sys/linux/dev_watch_queue_arm.const b/sys/linux/dev_watch_queue_arm.const new file mode 100644 index 000000000..d7850096d --- /dev/null +++ b/sys/linux/dev_watch_queue_arm.const @@ -0,0 +1,9 @@ +# AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 +IOC_WATCH_QUEUE_SET_FILTER = 22369 +IOC_WATCH_QUEUE_SET_SIZE = 22368 +__NR_ioctl = 54 +__NR_mmap = 192 +__NR_mmap2 = 192 +__NR_openat = 322 +__NR_watch_devices = 436 diff --git a/sys/linux/dev_watch_queue_arm64.const b/sys/linux/dev_watch_queue_arm64.const new file mode 100644 index 000000000..951644fd3 --- /dev/null +++ b/sys/linux/dev_watch_queue_arm64.const @@ -0,0 +1,9 @@ +# AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 +IOC_WATCH_QUEUE_SET_FILTER = 22369 +IOC_WATCH_QUEUE_SET_SIZE = 22368 +__NR_ioctl = 29 +__NR_mmap = 222 +# __NR_mmap2 is not set +__NR_openat = 56 +__NR_watch_devices = 436 diff --git a/sys/linux/dev_watch_queue_mips64le.const b/sys/linux/dev_watch_queue_mips64le.const new file mode 100644 index 000000000..37a14045d --- /dev/null +++ b/sys/linux/dev_watch_queue_mips64le.const @@ -0,0 +1,9 @@ +# AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 +IOC_WATCH_QUEUE_SET_FILTER = 536893281 +IOC_WATCH_QUEUE_SET_SIZE = 536893280 +__NR_ioctl = 5015 +__NR_mmap = 5009 +# __NR_mmap2 is not set +__NR_openat = 5247 +__NR_watch_devices = 5436 diff --git a/sys/linux/dev_watch_queue_ppc64le.const b/sys/linux/dev_watch_queue_ppc64le.const new file mode 100644 index 000000000..b0993c721 --- /dev/null +++ b/sys/linux/dev_watch_queue_ppc64le.const @@ -0,0 +1,9 @@ +# AUTOGENERATED FILE +AT_FDCWD = 18446744073709551516 +IOC_WATCH_QUEUE_SET_FILTER = 536893281 +IOC_WATCH_QUEUE_SET_SIZE = 536893280 +__NR_ioctl = 54 +__NR_mmap = 90 +# __NR_mmap2 is not set +__NR_openat = 286 +__NR_watch_devices = 436 diff --git a/sys/linux/watch_queue.txt b/sys/linux/watch_queue.txt deleted file mode 100644 index c414f184b..000000000 --- a/sys/linux/watch_queue.txt +++ /dev/null @@ -1,31 +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 -include - -resource fd_watch_queue[fd] - -openat$watch_queue(fd const[AT_FDCWD], file ptr[in, string["/dev/watch_queue"]], flags flags[open_flags], mode const[0]) fd_watch_queue -mmap$watch_queue(addr vma, len len[addr], prot flags[mmap_prot], flags flags[mmap_flags], fd fd_watch_queue, offset const[0]) -ioctl$IOC_WATCH_QUEUE_SET_SIZE(fd fd_watch_queue, cmd const[IOC_WATCH_QUEUE_SET_SIZE], arg flags[watch_queue_size]) -ioctl$IOC_WATCH_QUEUE_SET_FILTER(fd fd_watch_queue, cmd const[IOC_WATCH_QUEUE_SET_FILTER], arg ptr[in, watch_notification_filter]) - -watch_devices(watch_fd fd_watch_queue, watch_id intptr[-1:0xff], flags const[0]) - -watch_notification_filter { - nr_filters len[filters, int32] - __reserved const[0, int32] - filters array[watch_notification_type_filter] -} - -watch_notification_type_filter { - type int32 - info_filter int32 - info_mask int32 - subtype_filter array[int32, 8] -} - -watch_queue_size = 1, 2, 4, 8, 16 -_ = __NR_mmap2 diff --git a/sys/linux/watch_queue_386.const b/sys/linux/watch_queue_386.const deleted file mode 100644 index 90ac59cb3..000000000 --- a/sys/linux/watch_queue_386.const +++ /dev/null @@ -1,9 +0,0 @@ -# AUTOGENERATED FILE -AT_FDCWD = 18446744073709551516 -IOC_WATCH_QUEUE_SET_FILTER = 22369 -IOC_WATCH_QUEUE_SET_SIZE = 22368 -__NR_ioctl = 54 -__NR_mmap = 192 -__NR_mmap2 = 192 -__NR_openat = 295 -__NR_watch_devices = 436 diff --git a/sys/linux/watch_queue_amd64.const b/sys/linux/watch_queue_amd64.const deleted file mode 100644 index 362ffd18a..000000000 --- a/sys/linux/watch_queue_amd64.const +++ /dev/null @@ -1,9 +0,0 @@ -# AUTOGENERATED FILE -AT_FDCWD = 18446744073709551516 -IOC_WATCH_QUEUE_SET_FILTER = 22369 -IOC_WATCH_QUEUE_SET_SIZE = 22368 -__NR_ioctl = 16 -__NR_mmap = 9 -# __NR_mmap2 is not set -__NR_openat = 257 -__NR_watch_devices = 436 diff --git a/sys/linux/watch_queue_arm.const b/sys/linux/watch_queue_arm.const deleted file mode 100644 index d7850096d..000000000 --- a/sys/linux/watch_queue_arm.const +++ /dev/null @@ -1,9 +0,0 @@ -# AUTOGENERATED FILE -AT_FDCWD = 18446744073709551516 -IOC_WATCH_QUEUE_SET_FILTER = 22369 -IOC_WATCH_QUEUE_SET_SIZE = 22368 -__NR_ioctl = 54 -__NR_mmap = 192 -__NR_mmap2 = 192 -__NR_openat = 322 -__NR_watch_devices = 436 diff --git a/sys/linux/watch_queue_arm64.const b/sys/linux/watch_queue_arm64.const deleted file mode 100644 index 951644fd3..000000000 --- a/sys/linux/watch_queue_arm64.const +++ /dev/null @@ -1,9 +0,0 @@ -# AUTOGENERATED FILE -AT_FDCWD = 18446744073709551516 -IOC_WATCH_QUEUE_SET_FILTER = 22369 -IOC_WATCH_QUEUE_SET_SIZE = 22368 -__NR_ioctl = 29 -__NR_mmap = 222 -# __NR_mmap2 is not set -__NR_openat = 56 -__NR_watch_devices = 436 diff --git a/sys/linux/watch_queue_mips64le.const b/sys/linux/watch_queue_mips64le.const deleted file mode 100644 index 37a14045d..000000000 --- a/sys/linux/watch_queue_mips64le.const +++ /dev/null @@ -1,9 +0,0 @@ -# AUTOGENERATED FILE -AT_FDCWD = 18446744073709551516 -IOC_WATCH_QUEUE_SET_FILTER = 536893281 -IOC_WATCH_QUEUE_SET_SIZE = 536893280 -__NR_ioctl = 5015 -__NR_mmap = 5009 -# __NR_mmap2 is not set -__NR_openat = 5247 -__NR_watch_devices = 5436 diff --git a/sys/linux/watch_queue_ppc64le.const b/sys/linux/watch_queue_ppc64le.const deleted file mode 100644 index b0993c721..000000000 --- a/sys/linux/watch_queue_ppc64le.const +++ /dev/null @@ -1,9 +0,0 @@ -# AUTOGENERATED FILE -AT_FDCWD = 18446744073709551516 -IOC_WATCH_QUEUE_SET_FILTER = 536893281 -IOC_WATCH_QUEUE_SET_SIZE = 536893280 -__NR_ioctl = 54 -__NR_mmap = 90 -# __NR_mmap2 is not set -__NR_openat = 286 -__NR_watch_devices = 436 diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go index 168f4aa0f..22cd44402 100644 --- a/sys/syz-extract/extract.go +++ b/sys/syz-extract/extract.go @@ -250,7 +250,7 @@ func archFileList(os, arch string, files []string) (string, []string, []string, // Not upstream, generated on unknown tree. "futex.txt": true, // Was in linux-next, but then was removed, fate is unknown. - "watch_queue.txt": true, + "dev_watch_queue.txt": true, } androidFiles := map[string]bool{ "dev_tlk_device.txt": true, -- cgit mrf-deployment