aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-03-18 13:35:11 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-03-18 13:35:11 +0100
commit61f9c92f3a465025d2b9d91f429aaec968aeaa2a (patch)
tree5a39a30d81fcf123c62bbb86cb4df0beed7f0ab4 /sys/linux
parent13026d10f09f0e801c342e6c009ff580d49b894b (diff)
sys/linux: restrict SYSLOG_ACTION_CONSOLE_LEVEL
Fuzzer must not mess with console, turn it on/off, change log level, etc. Otherwise it turns off kernel output on console.
Diffstat (limited to 'sys/linux')
-rw-r--r--sys/linux/dev_rfkill_386.const2
-rw-r--r--sys/linux/dev_rfkill_amd64.const2
-rw-r--r--sys/linux/dev_rfkill_arm.const2
-rw-r--r--sys/linux/dev_rfkill_arm64.const2
-rw-r--r--sys/linux/dev_rfkill_ppc64le.const2
-rw-r--r--sys/linux/gen/386.go5
-rw-r--r--sys/linux/gen/amd64.go5
-rw-r--r--sys/linux/gen/arm.go5
-rw-r--r--sys/linux/gen/arm64.go5
-rw-r--r--sys/linux/gen/ppc64le.go5
-rw-r--r--sys/linux/init.go110
-rw-r--r--sys/linux/sys.txt4
-rw-r--r--sys/linux/sys_386.const1
-rw-r--r--sys/linux/sys_amd64.const1
-rw-r--r--sys/linux/sys_arm.const1
-rw-r--r--sys/linux/sys_arm64.const1
-rw-r--r--sys/linux/sys_ppc64le.const1
17 files changed, 89 insertions, 65 deletions
diff --git a/sys/linux/dev_rfkill_386.const b/sys/linux/dev_rfkill_386.const
index d1a492d6a..cd2309505 100644
--- a/sys/linux/dev_rfkill_386.const
+++ b/sys/linux/dev_rfkill_386.const
@@ -1,7 +1,9 @@
# AUTOGENERATED FILE
+# AT_FDCWD is not set
NUM_RFKILL_TYPES = 9
RFKILL_IOCTL_NOINPUT = 20993
RFKILL_OP_CHANGE_ALL = 3
__NR_ioctl = 54
+__NR_openat = 295
__NR_read = 3
__NR_write = 4
diff --git a/sys/linux/dev_rfkill_amd64.const b/sys/linux/dev_rfkill_amd64.const
index dd1bad4c6..d6cf61291 100644
--- a/sys/linux/dev_rfkill_amd64.const
+++ b/sys/linux/dev_rfkill_amd64.const
@@ -1,7 +1,9 @@
# AUTOGENERATED FILE
+# AT_FDCWD is not set
NUM_RFKILL_TYPES = 9
RFKILL_IOCTL_NOINPUT = 20993
RFKILL_OP_CHANGE_ALL = 3
__NR_ioctl = 16
+__NR_openat = 257
__NR_read = 0
__NR_write = 1
diff --git a/sys/linux/dev_rfkill_arm.const b/sys/linux/dev_rfkill_arm.const
index d1a492d6a..68a2584bf 100644
--- a/sys/linux/dev_rfkill_arm.const
+++ b/sys/linux/dev_rfkill_arm.const
@@ -1,7 +1,9 @@
# AUTOGENERATED FILE
+# AT_FDCWD is not set
NUM_RFKILL_TYPES = 9
RFKILL_IOCTL_NOINPUT = 20993
RFKILL_OP_CHANGE_ALL = 3
__NR_ioctl = 54
+__NR_openat = 322
__NR_read = 3
__NR_write = 4
diff --git a/sys/linux/dev_rfkill_arm64.const b/sys/linux/dev_rfkill_arm64.const
index 22d2d5230..64bb2db0a 100644
--- a/sys/linux/dev_rfkill_arm64.const
+++ b/sys/linux/dev_rfkill_arm64.const
@@ -1,7 +1,9 @@
# AUTOGENERATED FILE
+# AT_FDCWD is not set
NUM_RFKILL_TYPES = 9
RFKILL_IOCTL_NOINPUT = 20993
RFKILL_OP_CHANGE_ALL = 3
__NR_ioctl = 29
+__NR_openat = 56
__NR_read = 63
__NR_write = 64
diff --git a/sys/linux/dev_rfkill_ppc64le.const b/sys/linux/dev_rfkill_ppc64le.const
index 6f2db63c8..97c50ede6 100644
--- a/sys/linux/dev_rfkill_ppc64le.const
+++ b/sys/linux/dev_rfkill_ppc64le.const
@@ -1,7 +1,9 @@
# AUTOGENERATED FILE
+# AT_FDCWD is not set
NUM_RFKILL_TYPES = 9
RFKILL_IOCTL_NOINPUT = 536891905
RFKILL_OP_CHANGE_ALL = 3
__NR_ioctl = 54
+__NR_openat = 286
__NR_read = 3
__NR_write = 4
diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 83b5d0aed..2dbf08714 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -39221,7 +39221,7 @@ var syscalls_386 = []*Syscall{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "info", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
}},
{NR: 103, Name: "syslog", CallName: "syslog", Args: []Type{
- &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 6, 9, 10}},
+ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 9, 10}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf", TypeSize: 4, IsOptional: true}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 4}}, Buf: "buf"},
}},
@@ -45374,6 +45374,7 @@ var consts_386 = []ConstValue{
{Name: "SYNC_FILE_RANGE_WRITE", Value: 2},
{Name: "SYSLOG_ACTION_CLEAR", Value: 5},
{Name: "SYSLOG_ACTION_CLOSE"},
+ {Name: "SYSLOG_ACTION_CONSOLE_LEVEL", Value: 8},
{Name: "SYSLOG_ACTION_CONSOLE_OFF", Value: 6},
{Name: "SYSLOG_ACTION_CONSOLE_ON", Value: 7},
{Name: "SYSLOG_ACTION_OPEN", Value: 1},
@@ -47815,4 +47816,4 @@ var consts_386 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_386 = "7cc507343dee5356a071ba44c5b8aea2254fbc41"
+const revision_386 = "72273f6f16e80a8a90e864e2816e286cdd89a4b1"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index 3cb5e48b7..cadc8c817 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -39741,7 +39741,7 @@ var syscalls_amd64 = []*Syscall{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "info", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
}},
{NR: 103, Name: "syslog", CallName: "syslog", Args: []Type{
- &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 6, 9, 10}},
+ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 9, 10}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf", TypeSize: 8, IsOptional: true}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Buf: "buf"},
}},
@@ -45894,6 +45894,7 @@ var consts_amd64 = []ConstValue{
{Name: "SYNC_FILE_RANGE_WRITE", Value: 2},
{Name: "SYSLOG_ACTION_CLEAR", Value: 5},
{Name: "SYSLOG_ACTION_CLOSE"},
+ {Name: "SYSLOG_ACTION_CONSOLE_LEVEL", Value: 8},
{Name: "SYSLOG_ACTION_CONSOLE_OFF", Value: 6},
{Name: "SYSLOG_ACTION_CONSOLE_ON", Value: 7},
{Name: "SYSLOG_ACTION_OPEN", Value: 1},
@@ -48350,4 +48351,4 @@ var consts_amd64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_amd64 = "1b83c687dd66fb52ff98e92e84b0de9a91d3a769"
+const revision_amd64 = "e2ace21303f7bc2a5b8faae08d0cf9ab50ccc8a9"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index e884a7ec8..fef455bbb 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -38877,7 +38877,7 @@ var syscalls_arm = []*Syscall{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "info", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
}},
{NR: 103, Name: "syslog", CallName: "syslog", Args: []Type{
- &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 6, 9, 10}},
+ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 9, 10}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf", TypeSize: 4, IsOptional: true}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 4}}, Buf: "buf"},
}},
@@ -44961,6 +44961,7 @@ var consts_arm = []ConstValue{
{Name: "SYNC_FILE_RANGE_WRITE", Value: 2},
{Name: "SYSLOG_ACTION_CLEAR", Value: 5},
{Name: "SYSLOG_ACTION_CLOSE"},
+ {Name: "SYSLOG_ACTION_CONSOLE_LEVEL", Value: 8},
{Name: "SYSLOG_ACTION_CONSOLE_OFF", Value: 6},
{Name: "SYSLOG_ACTION_CONSOLE_ON", Value: 7},
{Name: "SYSLOG_ACTION_OPEN", Value: 1},
@@ -47392,4 +47393,4 @@ var consts_arm = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_arm = "6962ddc02aaca1b341ba2013f3a49ed93315270e"
+const revision_arm = "884b94f59270cfa98684e7b9cbf06a7ee5cf0954"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index 0770cbba4..9f8b581f0 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -39217,7 +39217,7 @@ var syscalls_arm64 = []*Syscall{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "info", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
}},
{NR: 116, Name: "syslog", CallName: "syslog", Args: []Type{
- &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 6, 9, 10}},
+ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 9, 10}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf", TypeSize: 8, IsOptional: true}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Buf: "buf"},
}},
@@ -45285,6 +45285,7 @@ var consts_arm64 = []ConstValue{
{Name: "SYNC_FILE_RANGE_WRITE", Value: 2},
{Name: "SYSLOG_ACTION_CLEAR", Value: 5},
{Name: "SYSLOG_ACTION_CLOSE"},
+ {Name: "SYSLOG_ACTION_CONSOLE_LEVEL", Value: 8},
{Name: "SYSLOG_ACTION_CONSOLE_OFF", Value: 6},
{Name: "SYSLOG_ACTION_CONSOLE_ON", Value: 7},
{Name: "SYSLOG_ACTION_OPEN", Value: 1},
@@ -47700,4 +47701,4 @@ var consts_arm64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_arm64 = "4c009092e16fad6c60a8bc300210130c96b909e9"
+const revision_arm64 = "7cb46bb7746b32334da4dcd9d09245de99c0d74f"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index af248c4f4..b51fdc8ac 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -39164,7 +39164,7 @@ var syscalls_ppc64le = []*Syscall{
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "info", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
}},
{NR: 103, Name: "syslog", CallName: "syslog", Args: []Type{
- &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 7, 6, 9, 10}},
+ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "syslog_cmd", FldName: "cmd", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3, 4, 5, 9, 10}},
&PtrType{TypeCommon: TypeCommon{TypeName: "buffer", FldName: "buf", TypeSize: 8, IsOptional: true}, Type: &BufferType{TypeCommon: TypeCommon{ArgDir: 1, IsVarlen: true}}},
&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "len", TypeSize: 8}}, Buf: "buf"},
}},
@@ -45254,6 +45254,7 @@ var consts_ppc64le = []ConstValue{
{Name: "SYNC_FILE_RANGE_WRITE", Value: 2},
{Name: "SYSLOG_ACTION_CLEAR", Value: 5},
{Name: "SYSLOG_ACTION_CLOSE"},
+ {Name: "SYSLOG_ACTION_CONSOLE_LEVEL", Value: 8},
{Name: "SYSLOG_ACTION_CONSOLE_OFF", Value: 6},
{Name: "SYSLOG_ACTION_CONSOLE_ON", Value: 7},
{Name: "SYSLOG_ACTION_OPEN", Value: 1},
@@ -47637,4 +47638,4 @@ var consts_ppc64le = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}
-const revision_ppc64le = "52e9211f8a1d33c22eaa8126c55cb78998ccec39"
+const revision_ppc64le = "6e9b0467d0548b0e4442ac175065f4eb970b9794"
diff --git a/sys/linux/init.go b/sys/linux/init.go
index 83a79a70e..348c31f32 100644
--- a/sys/linux/init.go
+++ b/sys/linux/init.go
@@ -13,32 +13,33 @@ import (
func InitTarget(target *prog.Target) {
arch := &arch{
- unix: targets.MakeUnixSanitizer(target),
- clockGettimeSyscall: target.SyscallMap["clock_gettime"],
- MREMAP_MAYMOVE: target.GetConst("MREMAP_MAYMOVE"),
- MREMAP_FIXED: target.GetConst("MREMAP_FIXED"),
- SYSLOG_ACTION_CONSOLE_OFF: target.GetConst("SYSLOG_ACTION_CONSOLE_OFF"),
- SYSLOG_ACTION_CONSOLE_ON: target.GetConst("SYSLOG_ACTION_CONSOLE_ON"),
- SYSLOG_ACTION_SIZE_UNREAD: target.GetConst("SYSLOG_ACTION_SIZE_UNREAD"),
- FIFREEZE: target.GetConst("FIFREEZE"),
- FITHAW: target.GetConst("FITHAW"),
- SNAPSHOT_FREEZE: target.GetConst("SNAPSHOT_FREEZE"),
- SNAPSHOT_UNFREEZE: target.GetConst("SNAPSHOT_UNFREEZE"),
- EXT4_IOC_SHUTDOWN: target.GetConst("EXT4_IOC_SHUTDOWN"),
- EXT4_IOC_RESIZE_FS: target.GetConst("EXT4_IOC_RESIZE_FS"),
- EXT4_IOC_MIGRATE: target.GetConst("EXT4_IOC_MIGRATE"),
- FAN_OPEN_PERM: target.GetConst("FAN_OPEN_PERM"),
- FAN_ACCESS_PERM: target.GetConst("FAN_ACCESS_PERM"),
- FAN_OPEN_EXEC_PERM: target.GetConst("FAN_OPEN_EXEC_PERM"),
- PTRACE_TRACEME: target.GetConst("PTRACE_TRACEME"),
- CLOCK_REALTIME: target.GetConst("CLOCK_REALTIME"),
- AF_NFC: target.GetConst("AF_NFC"),
- AF_LLC: target.GetConst("AF_LLC"),
- AF_BLUETOOTH: target.GetConst("AF_BLUETOOTH"),
- AF_X25: target.GetConst("AF_X25"),
- AF_AX25: target.GetConst("AF_AX25"),
- AF_NETROM: target.GetConst("AF_NETROM"),
- AF_ROSE: target.GetConst("AF_ROSE"),
+ unix: targets.MakeUnixSanitizer(target),
+ clockGettimeSyscall: target.SyscallMap["clock_gettime"],
+ MREMAP_MAYMOVE: target.GetConst("MREMAP_MAYMOVE"),
+ MREMAP_FIXED: target.GetConst("MREMAP_FIXED"),
+ SYSLOG_ACTION_CONSOLE_OFF: target.GetConst("SYSLOG_ACTION_CONSOLE_OFF"),
+ SYSLOG_ACTION_CONSOLE_ON: target.GetConst("SYSLOG_ACTION_CONSOLE_ON"),
+ SYSLOG_ACTION_CONSOLE_LEVEL: target.GetConst("SYSLOG_ACTION_CONSOLE_LEVEL"),
+ SYSLOG_ACTION_SIZE_UNREAD: target.GetConst("SYSLOG_ACTION_SIZE_UNREAD"),
+ FIFREEZE: target.GetConst("FIFREEZE"),
+ FITHAW: target.GetConst("FITHAW"),
+ SNAPSHOT_FREEZE: target.GetConst("SNAPSHOT_FREEZE"),
+ SNAPSHOT_UNFREEZE: target.GetConst("SNAPSHOT_UNFREEZE"),
+ EXT4_IOC_SHUTDOWN: target.GetConst("EXT4_IOC_SHUTDOWN"),
+ EXT4_IOC_RESIZE_FS: target.GetConst("EXT4_IOC_RESIZE_FS"),
+ EXT4_IOC_MIGRATE: target.GetConst("EXT4_IOC_MIGRATE"),
+ FAN_OPEN_PERM: target.GetConst("FAN_OPEN_PERM"),
+ FAN_ACCESS_PERM: target.GetConst("FAN_ACCESS_PERM"),
+ FAN_OPEN_EXEC_PERM: target.GetConst("FAN_OPEN_EXEC_PERM"),
+ PTRACE_TRACEME: target.GetConst("PTRACE_TRACEME"),
+ CLOCK_REALTIME: target.GetConst("CLOCK_REALTIME"),
+ AF_NFC: target.GetConst("AF_NFC"),
+ AF_LLC: target.GetConst("AF_LLC"),
+ AF_BLUETOOTH: target.GetConst("AF_BLUETOOTH"),
+ AF_X25: target.GetConst("AF_X25"),
+ AF_AX25: target.GetConst("AF_AX25"),
+ AF_NETROM: target.GetConst("AF_NETROM"),
+ AF_ROSE: target.GetConst("AF_ROSE"),
// These are not present on all arches.
ARCH_SET_FS: target.ConstMap["ARCH_SET_FS"],
ARCH_SET_GS: target.ConstMap["ARCH_SET_GS"],
@@ -106,32 +107,33 @@ type arch struct {
clockGettimeSyscall *prog.Syscall
- MREMAP_MAYMOVE uint64
- MREMAP_FIXED uint64
- SYSLOG_ACTION_CONSOLE_OFF uint64
- SYSLOG_ACTION_CONSOLE_ON uint64
- SYSLOG_ACTION_SIZE_UNREAD uint64
- FIFREEZE uint64
- FITHAW uint64
- SNAPSHOT_FREEZE uint64
- SNAPSHOT_UNFREEZE uint64
- EXT4_IOC_SHUTDOWN uint64
- EXT4_IOC_RESIZE_FS uint64
- EXT4_IOC_MIGRATE uint64
- FAN_OPEN_PERM uint64
- FAN_ACCESS_PERM uint64
- FAN_OPEN_EXEC_PERM uint64
- PTRACE_TRACEME uint64
- CLOCK_REALTIME uint64
- ARCH_SET_FS uint64
- ARCH_SET_GS uint64
- AF_NFC uint64
- AF_LLC uint64
- AF_BLUETOOTH uint64
- AF_X25 uint64
- AF_AX25 uint64
- AF_NETROM uint64
- AF_ROSE uint64
+ MREMAP_MAYMOVE uint64
+ MREMAP_FIXED uint64
+ SYSLOG_ACTION_CONSOLE_OFF uint64
+ SYSLOG_ACTION_CONSOLE_ON uint64
+ SYSLOG_ACTION_CONSOLE_LEVEL uint64
+ SYSLOG_ACTION_SIZE_UNREAD uint64
+ FIFREEZE uint64
+ FITHAW uint64
+ SNAPSHOT_FREEZE uint64
+ SNAPSHOT_UNFREEZE uint64
+ EXT4_IOC_SHUTDOWN uint64
+ EXT4_IOC_RESIZE_FS uint64
+ EXT4_IOC_MIGRATE uint64
+ FAN_OPEN_PERM uint64
+ FAN_ACCESS_PERM uint64
+ FAN_OPEN_EXEC_PERM uint64
+ PTRACE_TRACEME uint64
+ CLOCK_REALTIME uint64
+ ARCH_SET_FS uint64
+ ARCH_SET_GS uint64
+ AF_NFC uint64
+ AF_LLC uint64
+ AF_BLUETOOTH uint64
+ AF_X25 uint64
+ AF_AX25 uint64
+ AF_NETROM uint64
+ AF_ROSE uint64
}
func (arch *arch) sanitizeCall(c *prog.Call) {
@@ -147,7 +149,9 @@ func (arch *arch) sanitizeCall(c *prog.Call) {
cmd := c.Args[0].(*prog.ConstArg)
cmd.Val = uint64(uint32(cmd.Val))
// These disable console output, but we need it.
- if cmd.Val == arch.SYSLOG_ACTION_CONSOLE_OFF || cmd.Val == arch.SYSLOG_ACTION_CONSOLE_ON {
+ if cmd.Val == arch.SYSLOG_ACTION_CONSOLE_OFF ||
+ cmd.Val == arch.SYSLOG_ACTION_CONSOLE_ON ||
+ cmd.Val == arch.SYSLOG_ACTION_CONSOLE_LEVEL {
cmd.Val = arch.SYSLOG_ACTION_SIZE_UNREAD
}
case "ioctl":
diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt
index 00b3908c4..93bf11496 100644
--- a/sys/linux/sys.txt
+++ b/sys/linux/sys.txt
@@ -886,7 +886,7 @@ kcmp_flags = KCMP_FILE, KCMP_FILES, KCMP_FS, KCMP_IO, KCMP_SIGHAND, KCMP_SYSVSEM
rusage_who = RUSAGE_SELF, RUSAGE_CHILDREN, RUSAGE_THREAD
rlimit_type = RLIMIT_AS, RLIMIT_CORE, RLIMIT_CPU, RLIMIT_DATA, RLIMIT_FSIZE, RLIMIT_LOCKS, RLIMIT_MEMLOCK, RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_NOFILE, RLIMIT_NPROC, RLIMIT_RSS, RLIMIT_RTPRIO, RLIMIT_RTTIME, RLIMIT_SIGPENDING, RLIMIT_STACK
# The ones that disable console output are intentionally omitted.
-syslog_cmd = SYSLOG_ACTION_CLOSE, SYSLOG_ACTION_OPEN, SYSLOG_ACTION_READ, SYSLOG_ACTION_READ_ALL, SYSLOG_ACTION_READ_CLEAR, SYSLOG_ACTION_CLEAR, SYSLOG_ACTION_CONSOLE_ON, SYSLOG_ACTION_CONSOLE_OFF, SYSLOG_ACTION_SIZE_UNREAD, SYSLOG_ACTION_SIZE_BUFFER
+syslog_cmd = SYSLOG_ACTION_CLOSE, SYSLOG_ACTION_OPEN, SYSLOG_ACTION_READ, SYSLOG_ACTION_READ_ALL, SYSLOG_ACTION_READ_CLEAR, SYSLOG_ACTION_CLEAR, SYSLOG_ACTION_SIZE_UNREAD, SYSLOG_ACTION_SIZE_BUFFER
ioprio_which_pid = IOPRIO_WHO_PROCESS, IOPRIO_WHO_PGRP
ioprio_which_uid = IOPRIO_WHO_USER
personality_flags = PER_LINUX, PER_SVR4, PER_SVR3, PER_OSR5, PER_WYSEV386, PER_ISCR4, PER_BSD, PER_XENIX, PER_LINUX32, PER_IRIX32, PER_IRIXN32, PER_IRIX64, PER_RISCOS, PER_SOLARIS, PER_UW7, PER_OSF4, PER_HPUX, ADDR_NO_RANDOMIZE, MMAP_PAGE_ZERO, ADDR_COMPAT_LAYOUT, READ_IMPLIES_EXEC, ADDR_LIMIT_32BIT, SHORT_INODE, WHOLE_SECONDS, STICKY_TIMEOUTS, ADDR_LIMIT_3GB
@@ -937,7 +937,7 @@ _ = STA_PLL, STA_PPSFREQ, STA_PPSTIME, STA_FLL, STA_INS, STA_DEL, STA_UNSYNC, ST
_ = ADJ_OFFSET, ADJ_FREQUENCY, ADJ_MAXERROR, ADJ_ESTERROR, ADJ_STATUS, ADJ_TIMECONST, ADJ_TAI, ADJ_SETOFFSET, ADJ_MICRO, ADJ_NANO, ADJ_TICK, ADJ_OFFSET_SINGLESHOT
# misc
-_ = KCOV_INIT_TRACE, KCOV_ENABLE, KCOV_DISABLE, KCOV_TRACE_PC, KCOV_TRACE_CMP, FIFREEZE, PTRACE_TRACEME, __NR_mmap2
+_ = KCOV_INIT_TRACE, KCOV_ENABLE, KCOV_DISABLE, KCOV_TRACE_PC, KCOV_TRACE_CMP, FIFREEZE, PTRACE_TRACEME, SYSLOG_ACTION_CONSOLE_ON, SYSLOG_ACTION_CONSOLE_OFF, SYSLOG_ACTION_CONSOLE_LEVEL, __NR_mmap2
# Hardcode KCOV_REMOTE_ENABLE value for amd64 until new kcov patches reach mainline.
define KCOV_REMOTE_ENABLE 1075340134
diff --git a/sys/linux/sys_386.const b/sys/linux/sys_386.const
index 2d1ad6a40..b53e85e80 100644
--- a/sys/linux/sys_386.const
+++ b/sys/linux/sys_386.const
@@ -499,6 +499,7 @@ SYNC_FILE_RANGE_WAIT_BEFORE = 1
SYNC_FILE_RANGE_WRITE = 2
SYSLOG_ACTION_CLEAR = 5
SYSLOG_ACTION_CLOSE = 0
+SYSLOG_ACTION_CONSOLE_LEVEL = 8
SYSLOG_ACTION_CONSOLE_OFF = 6
SYSLOG_ACTION_CONSOLE_ON = 7
SYSLOG_ACTION_OPEN = 1
diff --git a/sys/linux/sys_amd64.const b/sys/linux/sys_amd64.const
index 2b062ec8d..ecb9def09 100644
--- a/sys/linux/sys_amd64.const
+++ b/sys/linux/sys_amd64.const
@@ -499,6 +499,7 @@ SYNC_FILE_RANGE_WAIT_BEFORE = 1
SYNC_FILE_RANGE_WRITE = 2
SYSLOG_ACTION_CLEAR = 5
SYSLOG_ACTION_CLOSE = 0
+SYSLOG_ACTION_CONSOLE_LEVEL = 8
SYSLOG_ACTION_CONSOLE_OFF = 6
SYSLOG_ACTION_CONSOLE_ON = 7
SYSLOG_ACTION_OPEN = 1
diff --git a/sys/linux/sys_arm.const b/sys/linux/sys_arm.const
index cf9eab86a..223ab9a4f 100644
--- a/sys/linux/sys_arm.const
+++ b/sys/linux/sys_arm.const
@@ -499,6 +499,7 @@ SYNC_FILE_RANGE_WAIT_BEFORE = 1
SYNC_FILE_RANGE_WRITE = 2
SYSLOG_ACTION_CLEAR = 5
SYSLOG_ACTION_CLOSE = 0
+SYSLOG_ACTION_CONSOLE_LEVEL = 8
SYSLOG_ACTION_CONSOLE_OFF = 6
SYSLOG_ACTION_CONSOLE_ON = 7
SYSLOG_ACTION_OPEN = 1
diff --git a/sys/linux/sys_arm64.const b/sys/linux/sys_arm64.const
index f97d925f5..bb4490cff 100644
--- a/sys/linux/sys_arm64.const
+++ b/sys/linux/sys_arm64.const
@@ -499,6 +499,7 @@ SYNC_FILE_RANGE_WAIT_BEFORE = 1
SYNC_FILE_RANGE_WRITE = 2
SYSLOG_ACTION_CLEAR = 5
SYSLOG_ACTION_CLOSE = 0
+SYSLOG_ACTION_CONSOLE_LEVEL = 8
SYSLOG_ACTION_CONSOLE_OFF = 6
SYSLOG_ACTION_CONSOLE_ON = 7
SYSLOG_ACTION_OPEN = 1
diff --git a/sys/linux/sys_ppc64le.const b/sys/linux/sys_ppc64le.const
index 189f9acd9..091430bc4 100644
--- a/sys/linux/sys_ppc64le.const
+++ b/sys/linux/sys_ppc64le.const
@@ -499,6 +499,7 @@ SYNC_FILE_RANGE_WAIT_BEFORE = 1
SYNC_FILE_RANGE_WRITE = 2
SYSLOG_ACTION_CLEAR = 5
SYSLOG_ACTION_CLOSE = 0
+SYSLOG_ACTION_CONSOLE_LEVEL = 8
SYSLOG_ACTION_CONSOLE_OFF = 6
SYSLOG_ACTION_CONSOLE_ON = 7
SYSLOG_ACTION_OPEN = 1