From 9ca2afa12c5c4d2ebc564a0b2d555571d7a1c719 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 28 Oct 2018 20:35:35 +0100 Subject: sys/linux: open /dev/media* files Also remove the second syscall for opening of /dev/fd*. --- executor/defs.h | 10 +++++----- executor/syscalls.h | 10 +++++----- sys/linux/floppy.txt | 2 +- sys/linux/gen/386.go | 14 +++++++------- sys/linux/gen/amd64.go | 14 +++++++------- sys/linux/gen/arm.go | 14 +++++++------- sys/linux/gen/arm64.go | 14 +++++++------- sys/linux/gen/ppc64le.go | 14 +++++++------- sys/linux/sys.txt | 2 +- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index 630fc1457..ed45cfcf4 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -60,7 +60,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "bbd34d3555747dc8300241a2f4aea781dd9808e5" +#define SYZ_REVISION "c58e0ef3bec0adabbacb58c0f68cf210ec99bed3" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -70,7 +70,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "8fb298067e48f9c0a00ffa20222070826cbbd1f7" +#define SYZ_REVISION "c543412fe478411344f57567f308a77b569e679e" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "c1865be0e68a1ef777b097cd24653000c5aac793" +#define SYZ_REVISION "1b895defe0d82254347dcf6ea67a6b6066070556" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "3e550deffd3ef91a3204a6ea23f7cab08b653f1b" +#define SYZ_REVISION "9bda36ff0150a1c23a6ae08213c71d6c28538959" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "522dfbea4c7558b5e2e1768f65ac43488b04e478" +#define SYZ_REVISION "2cc9b537a309fd760f2d39bef892085021ec109a" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index 0cb50a8ca..0613b7ef4 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -3349,7 +3349,6 @@ const call_t syscalls[] = { {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$CDROM_DEV_LINK", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$FLOPPY", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$admmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$adsp", 0, (syscall_t)syz_open_dev}, @@ -3365,6 +3364,7 @@ const call_t syscalls[] = { {"syz_open_dev$floppy", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, @@ -5648,7 +5648,6 @@ const call_t syscalls[] = { {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$CDROM_DEV_LINK", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$FLOPPY", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$admmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$adsp", 0, (syscall_t)syz_open_dev}, @@ -5664,6 +5663,7 @@ const call_t syscalls[] = { {"syz_open_dev$floppy", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, @@ -7906,7 +7906,6 @@ const call_t syscalls[] = { {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$CDROM_DEV_LINK", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$FLOPPY", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$admmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$adsp", 0, (syscall_t)syz_open_dev}, @@ -7922,6 +7921,7 @@ const call_t syscalls[] = { {"syz_open_dev$floppy", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, @@ -10138,7 +10138,6 @@ const call_t syscalls[] = { {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$CDROM_DEV_LINK", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$FLOPPY", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$admmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$adsp", 0, (syscall_t)syz_open_dev}, @@ -10154,6 +10153,7 @@ const call_t syscalls[] = { {"syz_open_dev$floppy", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, @@ -12247,7 +12247,6 @@ const call_t syscalls[] = { {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$CDROM_DEV_LINK", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$FLOPPY", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$admmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$adsp", 0, (syscall_t)syz_open_dev}, @@ -12263,6 +12262,7 @@ const call_t syscalls[] = { {"syz_open_dev$floppy", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, diff --git a/sys/linux/floppy.txt b/sys/linux/floppy.txt index 1f5b08417..2af0fb386 100644 --- a/sys/linux/floppy.txt +++ b/sys/linux/floppy.txt @@ -9,7 +9,7 @@ include resource fd_floppy[fd] -syz_open_dev$FLOPPY(dev ptr[in, string["/dev/fd#"]], id intptr, flags flags[open_flags]) fd_floppy +syz_open_dev$floppy(dev ptr[in, string["/dev/fd#"]], id intptr, flags flags[open_flags]) fd_floppy ioctl$FLOPPY_FDEJECT(fd fd_floppy, cmd const[FDEJECT]) ioctl$FLOPPY_FDCLRPRM(fd fd_floppy, cmd const[FDCLRPRM]) diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go index d3138c159..e17bb4ff5 100644 --- a/sys/linux/gen/386.go +++ b/sys/linux/gen/386.go @@ -34186,11 +34186,6 @@ var syscalls_386 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_cdrom", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {Name: "syz_open_dev$FLOPPY", CallName: "syz_open_dev", Args: []Type{ - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$I2C", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 11}, Kind: 2, Values: []string{"/dev/i2c-#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, @@ -34255,7 +34250,7 @@ var syscalls_386 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$ircomm", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 13}, Kind: 2, Values: []string{"/dev/ircomm#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, @@ -34266,6 +34261,11 @@ var syscalls_386 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {Name: "syz_open_dev$media", CallName: "syz_open_dev", Args: []Type{ + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 12}, Kind: 2, Values: []string{"/dev/media#\x00"}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$mice", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 16}, Kind: 2, Values: []string{"/dev/input/mice\x00"}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id", TypeSize: 4}}}, @@ -41656,4 +41656,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "bbd34d3555747dc8300241a2f4aea781dd9808e5" +const revision_386 = "c58e0ef3bec0adabbacb58c0f68cf210ec99bed3" diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go index f380a68e9..46e2de841 100644 --- a/sys/linux/gen/amd64.go +++ b/sys/linux/gen/amd64.go @@ -34864,11 +34864,6 @@ var syscalls_amd64 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_cdrom", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {Name: "syz_open_dev$FLOPPY", CallName: "syz_open_dev", Args: []Type{ - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$I2C", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 11}, Kind: 2, Values: []string{"/dev/i2c-#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, @@ -34933,7 +34928,7 @@ var syscalls_amd64 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$ircomm", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 13}, Kind: 2, Values: []string{"/dev/ircomm#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, @@ -34944,6 +34939,11 @@ var syscalls_amd64 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {Name: "syz_open_dev$media", CallName: "syz_open_dev", Args: []Type{ + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 12}, Kind: 2, Values: []string{"/dev/media#\x00"}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 16384, 65536, 128, 32768, 262144, 256, 131072, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$mice", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 16}, Kind: 2, Values: []string{"/dev/input/mice\x00"}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id", TypeSize: 8}}}, @@ -42359,4 +42359,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "8fb298067e48f9c0a00ffa20222070826cbbd1f7" +const revision_amd64 = "c543412fe478411344f57567f308a77b569e679e" diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go index 6a3a25550..c6d539406 100644 --- a/sys/linux/gen/arm.go +++ b/sys/linux/gen/arm.go @@ -34121,11 +34121,6 @@ var syscalls_arm = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_cdrom", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {Name: "syz_open_dev$FLOPPY", CallName: "syz_open_dev", Args: []Type{ - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$I2C", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 11}, Kind: 2, Values: []string{"/dev/i2c-#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, @@ -34190,7 +34185,7 @@ var syscalls_arm = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$ircomm", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 13}, Kind: 2, Values: []string{"/dev/ircomm#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, @@ -34201,6 +34196,11 @@ var syscalls_arm = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {Name: "syz_open_dev$media", CallName: "syz_open_dev", Args: []Type{ + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 12}, Kind: 2, Values: []string{"/dev/media#\x00"}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 4}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$mice", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 16}, Kind: 2, Values: []string{"/dev/input/mice\x00"}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id", TypeSize: 4}}}, @@ -41527,4 +41527,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "c1865be0e68a1ef777b097cd24653000c5aac793" +const revision_arm = "1b895defe0d82254347dcf6ea67a6b6066070556" diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go index 05cb134e5..652d525ec 100644 --- a/sys/linux/gen/arm64.go +++ b/sys/linux/gen/arm64.go @@ -34367,11 +34367,6 @@ var syscalls_arm64 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_cdrom", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {Name: "syz_open_dev$FLOPPY", CallName: "syz_open_dev", Args: []Type{ - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$I2C", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 11}, Kind: 2, Values: []string{"/dev/i2c-#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, @@ -34436,7 +34431,7 @@ var syscalls_arm64 = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$ircomm", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 13}, Kind: 2, Values: []string{"/dev/ircomm#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, @@ -34447,6 +34442,11 @@ var syscalls_arm64 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {Name: "syz_open_dev$media", CallName: "syz_open_dev", Args: []Type{ + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 12}, Kind: 2, Values: []string{"/dev/media#\x00"}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 65536, 16384, 128, 131072, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$mice", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 16}, Kind: 2, Values: []string{"/dev/input/mice\x00"}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id", TypeSize: 8}}}, @@ -41749,4 +41749,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "3e550deffd3ef91a3204a6ea23f7cab08b653f1b" +const revision_arm64 = "9bda36ff0150a1c23a6ae08213c71d6c28538959" diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go index 113de28f2..6c2ae03c0 100644 --- a/sys/linux/gen/ppc64le.go +++ b/sys/linux/gen/ppc64le.go @@ -32741,11 +32741,6 @@ var syscalls_ppc64le = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 131072, 16384, 128, 65536, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_cdrom", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, - {Name: "syz_open_dev$FLOPPY", CallName: "syz_open_dev", Args: []Type{ - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 131072, 16384, 128, 65536, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$I2C", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 11}, Kind: 2, Values: []string{"/dev/i2c-#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, @@ -32810,7 +32805,7 @@ var syscalls_ppc64le = []*Syscall{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 9}, Kind: 2, Values: []string{"/dev/fd#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 131072, 16384, 128, 65536, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, - }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_floppy", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$ircomm", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 13}, Kind: 2, Values: []string{"/dev/ircomm#\x00"}}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, @@ -32821,6 +32816,11 @@ var syscalls_ppc64le = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 131072, 16384, 128, 65536, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, + {Name: "syz_open_dev$media", CallName: "syz_open_dev", Args: []Type{ + &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 12}, Kind: 2, Values: []string{"/dev/media#\x00"}}}, + &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "id", TypeSize: 8}}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "open_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 1024, 8192, 524288, 64, 131072, 16384, 128, 65536, 262144, 256, 32768, 2048, 2097152, 1052672, 512, 4194304}, BitMask: true}, + }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {Name: "syz_open_dev$mice", CallName: "syz_open_dev", Args: []Type{ &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "dev", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 16}, Kind: 2, Values: []string{"/dev/input/mice\x00"}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "id", TypeSize: 8}}}, @@ -39107,4 +39107,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "522dfbea4c7558b5e2e1768f65ac43488b04e478" +const revision_ppc64le = "2cc9b537a309fd760f2d39bef892085021ec109a" diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt index a6826d637..8982cc70a 100644 --- a/sys/linux/sys.txt +++ b/sys/linux/sys.txt @@ -458,7 +458,6 @@ procfs_file = "auxv", "cmdline", "environ", "autogroup", "cgroup", "clear_refs", # These devices are relatively safe (don't reboot and don't corrupt kernel memory). # They need a more comprehensive support. But let at least open them for now, # maybe fuzzer will be able to skrew them in a useful way. -syz_open_dev$floppy(dev ptr[in, string["/dev/fd#"]], id intptr, flags flags[open_flags]) fd syz_open_dev$vcsn(dev ptr[in, string["/dev/vcs#"]], id intptr, flags flags[open_flags]) fd syz_open_dev$vcsa(dev ptr[in, string["/dev/vcsa#"]], id intptr, flags flags[open_flags]) fd syz_open_dev$usbmon(dev ptr[in, string["/dev/usbmon#"]], id intptr, flags flags[open_flags]) fd @@ -474,6 +473,7 @@ syz_open_dev$usb(dev ptr[in, string["/dev/bus/usb/00#/00#"]], id intptr, flags f syz_open_dev$sndhw(dev ptr[in, string["/dev/snd/hwC#D#"]], id intptr, flags flags[open_flags]) fd syz_open_dev$sndpcmc(dev ptr[in, string["/dev/snd/pcmC#D#c"]], id intptr, flags flags[open_flags]) fd syz_open_dev$sndpcmp(dev ptr[in, string["/dev/snd/pcmC#D#p"]], id intptr, flags flags[open_flags]) fd +syz_open_dev$media(dev ptr[in, string["/dev/media#"]], id intptr, flags flags[open_flags]) fd openat$null(fd const[AT_FDCWD], file ptr[in, string["/dev/null"]], flags flags[open_flags], mode const[0]) fd openat$zero(fd const[AT_FDCWD], file ptr[in, string["/dev/zero"]], flags flags[open_flags], mode const[0]) fd -- cgit mrf-deployment