From a6b071286e5b8062fe7e34314eaffd059df60116 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 6 Nov 2017 22:37:09 -0800 Subject: sys/linux: fix wrong ioctl numbers in loop device definitions Fix a couple apparent copy-and-paste errors: - ioctl$LOOP_CHANGE_FD should use LOOP_CHANGE_FD - ioctl$LOOP_CTL_REMOVE should use LOOP_CTL_REMOVE --- sys/linux/386.go | 8 +++++--- sys/linux/amd64.go | 8 +++++--- sys/linux/arm.go | 8 +++++--- sys/linux/arm64.go | 8 +++++--- sys/linux/loop.txt | 4 ++-- sys/linux/loop_386.const | 2 ++ sys/linux/loop_amd64.const | 2 ++ sys/linux/loop_arm.const | 2 ++ sys/linux/loop_arm64.const | 2 ++ sys/linux/loop_ppc64le.const | 2 ++ sys/linux/ppc64le.go | 8 +++++--- 11 files changed, 37 insertions(+), 17 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/386.go b/sys/linux/386.go index 82f381aa0..730c5d22b 100644 --- a/sys/linux/386.go +++ b/sys/linux/386.go @@ -8810,7 +8810,7 @@ var syscalls_386 = []*Syscall{ }}, {ID: 558, NR: 54, Name: "ioctl$LOOP_CHANGE_FD", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19456}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19462}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "arg", TypeSize: 4}}, }}, {ID: 559, NR: 54, Name: "ioctl$LOOP_CLR_FD", CallName: "ioctl", Args: []Type{ @@ -8828,7 +8828,7 @@ var syscalls_386 = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {ID: 562, NR: 54, Name: "ioctl$LOOP_CTL_REMOVE", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_ctrl", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19584}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19585}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "num", TypeSize: 4}}, }}, {ID: 563, NR: 54, Name: "ioctl$LOOP_GET_STATUS", CallName: "ioctl", Args: []Type{ @@ -15169,9 +15169,11 @@ var consts_386 = []ConstValue{ {Name: "LOCK_NB", Value: 4}, {Name: "LOCK_SH", Value: 1}, {Name: "LOCK_UN", Value: 8}, + {Name: "LOOP_CHANGE_FD", Value: 19462}, {Name: "LOOP_CLR_FD", Value: 19457}, {Name: "LOOP_CTL_ADD", Value: 19584}, {Name: "LOOP_CTL_GET_FREE", Value: 19586}, + {Name: "LOOP_CTL_REMOVE", Value: 19585}, {Name: "LOOP_GET_STATUS", Value: 19459}, {Name: "LOOP_GET_STATUS64", Value: 19461}, {Name: "LOOP_SET_CAPACITY", Value: 19463}, @@ -16785,4 +16787,4 @@ var consts_386 = []ConstValue{ {Name: "__WNOTHREAD", Value: 536870912}, } -const revision_386 = "d9161341e01611afac064dda39de96c30b364636" +const revision_386 = "abbefc7d8a5a29677b49db8e615454e266f052a5" diff --git a/sys/linux/amd64.go b/sys/linux/amd64.go index e75d31abf..b04ac468a 100644 --- a/sys/linux/amd64.go +++ b/sys/linux/amd64.go @@ -9083,7 +9083,7 @@ var syscalls_amd64 = []*Syscall{ }}, {ID: 576, NR: 16, Name: "ioctl$LOOP_CHANGE_FD", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19456}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19462}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "arg", TypeSize: 4}}, }}, {ID: 577, NR: 16, Name: "ioctl$LOOP_CLR_FD", CallName: "ioctl", Args: []Type{ @@ -9101,7 +9101,7 @@ var syscalls_amd64 = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "ret", TypeSize: 8, ArgDir: 1}}}, {ID: 580, NR: 16, Name: "ioctl$LOOP_CTL_REMOVE", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_ctrl", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19584}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19585}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "num", TypeSize: 8}}, }}, {ID: 581, NR: 16, Name: "ioctl$LOOP_GET_STATUS", CallName: "ioctl", Args: []Type{ @@ -15674,9 +15674,11 @@ var consts_amd64 = []ConstValue{ {Name: "LOCK_NB", Value: 4}, {Name: "LOCK_SH", Value: 1}, {Name: "LOCK_UN", Value: 8}, + {Name: "LOOP_CHANGE_FD", Value: 19462}, {Name: "LOOP_CLR_FD", Value: 19457}, {Name: "LOOP_CTL_ADD", Value: 19584}, {Name: "LOOP_CTL_GET_FREE", Value: 19586}, + {Name: "LOOP_CTL_REMOVE", Value: 19585}, {Name: "LOOP_GET_STATUS", Value: 19459}, {Name: "LOOP_GET_STATUS64", Value: 19461}, {Name: "LOOP_SET_CAPACITY", Value: 19463}, @@ -17316,4 +17318,4 @@ var consts_amd64 = []ConstValue{ {Name: "__WNOTHREAD", Value: 536870912}, } -const revision_amd64 = "1447e1368f72229d64bace71f732cef1dfdeb5b5" +const revision_amd64 = "cc80efbf27f36c6628b0a7ccea950e31ed9bb831" diff --git a/sys/linux/arm.go b/sys/linux/arm.go index 53465e4ea..fce2508b1 100644 --- a/sys/linux/arm.go +++ b/sys/linux/arm.go @@ -8591,7 +8591,7 @@ var syscalls_arm = []*Syscall{ }}, {ID: 542, NR: 9437238, Name: "ioctl$LOOP_CHANGE_FD", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19456}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19462}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "arg", TypeSize: 4}}, }}, {ID: 543, NR: 9437238, Name: "ioctl$LOOP_CLR_FD", CallName: "ioctl", Args: []Type{ @@ -8609,7 +8609,7 @@ var syscalls_arm = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "ret", TypeSize: 4, ArgDir: 1}}}, {ID: 546, NR: 9437238, Name: "ioctl$LOOP_CTL_REMOVE", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_ctrl", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19584}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 19585}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "num", TypeSize: 4}}, }}, {ID: 547, NR: 9437238, Name: "ioctl$LOOP_GET_STATUS", CallName: "ioctl", Args: []Type{ @@ -15079,9 +15079,11 @@ var consts_arm = []ConstValue{ {Name: "LOCK_NB", Value: 4}, {Name: "LOCK_SH", Value: 1}, {Name: "LOCK_UN", Value: 8}, + {Name: "LOOP_CHANGE_FD", Value: 19462}, {Name: "LOOP_CLR_FD", Value: 19457}, {Name: "LOOP_CTL_ADD", Value: 19584}, {Name: "LOOP_CTL_GET_FREE", Value: 19586}, + {Name: "LOOP_CTL_REMOVE", Value: 19585}, {Name: "LOOP_GET_STATUS", Value: 19459}, {Name: "LOOP_GET_STATUS64", Value: 19461}, {Name: "LOOP_SET_CAPACITY", Value: 19463}, @@ -16682,4 +16684,4 @@ var consts_arm = []ConstValue{ {Name: "__WNOTHREAD", Value: 536870912}, } -const revision_arm = "d0269f37947ea814944fa163bb69969ad1675368" +const revision_arm = "b78e373f34929c33b5c7f8f0c8d9fc37ce199e29" diff --git a/sys/linux/arm64.go b/sys/linux/arm64.go index af4f05ce8..d3801f319 100644 --- a/sys/linux/arm64.go +++ b/sys/linux/arm64.go @@ -8688,7 +8688,7 @@ var syscalls_arm64 = []*Syscall{ }}, {ID: 538, NR: 29, Name: "ioctl$LOOP_CHANGE_FD", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19456}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19462}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "arg", TypeSize: 4}}, }}, {ID: 539, NR: 29, Name: "ioctl$LOOP_CLR_FD", CallName: "ioctl", Args: []Type{ @@ -8706,7 +8706,7 @@ var syscalls_arm64 = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "ret", TypeSize: 8, ArgDir: 1}}}, {ID: 542, NR: 29, Name: "ioctl$LOOP_CTL_REMOVE", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_ctrl", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19584}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19585}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "num", TypeSize: 8}}, }}, {ID: 543, NR: 29, Name: "ioctl$LOOP_GET_STATUS", CallName: "ioctl", Args: []Type{ @@ -15113,9 +15113,11 @@ var consts_arm64 = []ConstValue{ {Name: "LOCK_NB", Value: 4}, {Name: "LOCK_SH", Value: 1}, {Name: "LOCK_UN", Value: 8}, + {Name: "LOOP_CHANGE_FD", Value: 19462}, {Name: "LOOP_CLR_FD", Value: 19457}, {Name: "LOOP_CTL_ADD", Value: 19584}, {Name: "LOOP_CTL_GET_FREE", Value: 19586}, + {Name: "LOOP_CTL_REMOVE", Value: 19585}, {Name: "LOOP_GET_STATUS", Value: 19459}, {Name: "LOOP_GET_STATUS64", Value: 19461}, {Name: "LOOP_SET_CAPACITY", Value: 19463}, @@ -16693,4 +16695,4 @@ var consts_arm64 = []ConstValue{ {Name: "__WNOTHREAD", Value: 536870912}, } -const revision_arm64 = "0f161b65b9b47df42b011b2f117aa942cd7a0ba4" +const revision_arm64 = "31be48f9b510243ba452bf201ca2109861ba8ebd" diff --git a/sys/linux/loop.txt b/sys/linux/loop.txt index f31f5808f..57c12ef69 100644 --- a/sys/linux/loop.txt +++ b/sys/linux/loop.txt @@ -8,7 +8,7 @@ resource fd_loop[fd] syz_open_dev$loop(dev ptr[in, string["/dev/loop#"]], id intptr, flags flags[open_flags]) fd_loop ioctl$LOOP_SET_FD(fd fd_loop, cmd const[LOOP_SET_FD], arg fd) -ioctl$LOOP_CHANGE_FD(fd fd_loop, cmd const[LOOP_SET_FD], arg fd) +ioctl$LOOP_CHANGE_FD(fd fd_loop, cmd const[LOOP_CHANGE_FD], arg fd) ioctl$LOOP_CLR_FD(fd fd_loop, cmd const[LOOP_CLR_FD]) ioctl$LOOP_SET_STATUS(fd fd_loop, cmd const[LOOP_SET_STATUS], arg ptr[in, loop_info]) ioctl$LOOP_SET_STATUS64(fd fd_loop, cmd const[LOOP_SET_STATUS64], arg ptr[in, loop_info64]) @@ -22,7 +22,7 @@ resource fd_loop_num[intptr]: 0, 1, 2, 10, 11, 12 openat$loop_ctrl(fd const[AT_FDCWD], file ptr[in, string["/dev/loop-control"]], flags flags[open_flags], mode const[0]) fd_loop_ctrl ioctl$LOOP_CTL_GET_FREE(fd fd_loop_ctrl, cmd const[LOOP_CTL_GET_FREE]) fd_loop_num ioctl$LOOP_CTL_ADD(fd fd_loop_ctrl, cmd const[LOOP_CTL_ADD], num fd_loop_num) -ioctl$LOOP_CTL_REMOVE(fd fd_loop_ctrl, cmd const[LOOP_CTL_ADD], num fd_loop_num) +ioctl$LOOP_CTL_REMOVE(fd fd_loop_ctrl, cmd const[LOOP_CTL_REMOVE], num fd_loop_num) lo_encrypt_type = LO_CRYPT_NONE, LO_CRYPT_XOR, LO_CRYPT_DES, LO_CRYPT_FISH2, LO_CRYPT_BLOW, LO_CRYPT_CAST128, LO_CRYPT_IDEA, LO_CRYPT_DUMMY, LO_CRYPT_SKIPJACK, LO_CRYPT_CRYPTOAPI lo_flags = LO_FLAGS_READ_ONLY, LO_FLAGS_AUTOCLEAR, LO_FLAGS_PARTSCAN, LO_FLAGS_DIRECT_IO diff --git a/sys/linux/loop_386.const b/sys/linux/loop_386.const index caf1f3dc3..0065cf2c4 100644 --- a/sys/linux/loop_386.const +++ b/sys/linux/loop_386.const @@ -1,8 +1,10 @@ # AUTOGENERATED FILE AT_FDCWD = 18446744073709551516 +LOOP_CHANGE_FD = 19462 LOOP_CLR_FD = 19457 LOOP_CTL_ADD = 19584 LOOP_CTL_GET_FREE = 19586 +LOOP_CTL_REMOVE = 19585 LOOP_GET_STATUS = 19459 LOOP_GET_STATUS64 = 19461 LOOP_SET_CAPACITY = 19463 diff --git a/sys/linux/loop_amd64.const b/sys/linux/loop_amd64.const index e5f796e24..5993ec846 100644 --- a/sys/linux/loop_amd64.const +++ b/sys/linux/loop_amd64.const @@ -1,8 +1,10 @@ # AUTOGENERATED FILE AT_FDCWD = 18446744073709551516 +LOOP_CHANGE_FD = 19462 LOOP_CLR_FD = 19457 LOOP_CTL_ADD = 19584 LOOP_CTL_GET_FREE = 19586 +LOOP_CTL_REMOVE = 19585 LOOP_GET_STATUS = 19459 LOOP_GET_STATUS64 = 19461 LOOP_SET_CAPACITY = 19463 diff --git a/sys/linux/loop_arm.const b/sys/linux/loop_arm.const index 4c92df6d5..2ed17b28d 100644 --- a/sys/linux/loop_arm.const +++ b/sys/linux/loop_arm.const @@ -1,8 +1,10 @@ # AUTOGENERATED FILE AT_FDCWD = 18446744073709551516 +LOOP_CHANGE_FD = 19462 LOOP_CLR_FD = 19457 LOOP_CTL_ADD = 19584 LOOP_CTL_GET_FREE = 19586 +LOOP_CTL_REMOVE = 19585 LOOP_GET_STATUS = 19459 LOOP_GET_STATUS64 = 19461 LOOP_SET_CAPACITY = 19463 diff --git a/sys/linux/loop_arm64.const b/sys/linux/loop_arm64.const index 3a28ed603..43d03c119 100644 --- a/sys/linux/loop_arm64.const +++ b/sys/linux/loop_arm64.const @@ -1,8 +1,10 @@ # AUTOGENERATED FILE AT_FDCWD = 18446744073709551516 +LOOP_CHANGE_FD = 19462 LOOP_CLR_FD = 19457 LOOP_CTL_ADD = 19584 LOOP_CTL_GET_FREE = 19586 +LOOP_CTL_REMOVE = 19585 LOOP_GET_STATUS = 19459 LOOP_GET_STATUS64 = 19461 LOOP_SET_CAPACITY = 19463 diff --git a/sys/linux/loop_ppc64le.const b/sys/linux/loop_ppc64le.const index 726a5b2f5..18e59be61 100644 --- a/sys/linux/loop_ppc64le.const +++ b/sys/linux/loop_ppc64le.const @@ -1,8 +1,10 @@ # AUTOGENERATED FILE AT_FDCWD = 18446744073709551516 +LOOP_CHANGE_FD = 19462 LOOP_CLR_FD = 19457 LOOP_CTL_ADD = 19584 LOOP_CTL_GET_FREE = 19586 +LOOP_CTL_REMOVE = 19585 LOOP_GET_STATUS = 19459 LOOP_GET_STATUS64 = 19461 LOOP_SET_CAPACITY = 19463 diff --git a/sys/linux/ppc64le.go b/sys/linux/ppc64le.go index 0fea53da9..89254f1d0 100644 --- a/sys/linux/ppc64le.go +++ b/sys/linux/ppc64le.go @@ -8542,7 +8542,7 @@ var syscalls_ppc64le = []*Syscall{ }}, {ID: 543, NR: 54, Name: "ioctl$LOOP_CHANGE_FD", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19456}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19462}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd", FldName: "arg", TypeSize: 4}}, }}, {ID: 544, NR: 54, Name: "ioctl$LOOP_CLR_FD", CallName: "ioctl", Args: []Type{ @@ -8560,7 +8560,7 @@ var syscalls_ppc64le = []*Syscall{ }, Ret: &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "ret", TypeSize: 8, ArgDir: 1}}}, {ID: 547, NR: 54, Name: "ioctl$LOOP_CTL_REMOVE", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_ctrl", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19584}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 19585}, &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_loop_num", FldName: "num", TypeSize: 8}}, }}, {ID: 548, NR: 54, Name: "ioctl$LOOP_GET_STATUS", CallName: "ioctl", Args: []Type{ @@ -14795,9 +14795,11 @@ var consts_ppc64le = []ConstValue{ {Name: "LOCK_NB", Value: 4}, {Name: "LOCK_SH", Value: 1}, {Name: "LOCK_UN", Value: 8}, + {Name: "LOOP_CHANGE_FD", Value: 19462}, {Name: "LOOP_CLR_FD", Value: 19457}, {Name: "LOOP_CTL_ADD", Value: 19584}, {Name: "LOOP_CTL_GET_FREE", Value: 19586}, + {Name: "LOOP_CTL_REMOVE", Value: 19585}, {Name: "LOOP_GET_STATUS", Value: 19459}, {Name: "LOOP_GET_STATUS64", Value: 19461}, {Name: "LOOP_SET_CAPACITY", Value: 19463}, @@ -16382,4 +16384,4 @@ var consts_ppc64le = []ConstValue{ {Name: "__WNOTHREAD", Value: 536870912}, } -const revision_ppc64le = "84a549c6f2de93e3cbb530dceca676a907351f90" +const revision_ppc64le = "72d813fc5083a52cc1a48b5ea685a79614a2cae7" -- cgit mrf-deployment