aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-03-02 13:04:04 +0100
committerDmitry Vyukov <dvyukov@google.com>2021-03-02 17:23:20 +0100
commite5b64d68915ed04952cef2f5dcb3f3ccbb7cfa57 (patch)
tree2912b3338a58d86e283dc116ac02f3a069b77c81 /sys
parentaff16d3fed742e27093858a70f8bd5cbf6f0dedd (diff)
sys/linux: update consts
Update consts on upstream 7a7fd0de4a9804299793e564a555a49c1fc924cb. Remove termiox ioctls, they were removed in commit e0efb3168d34.
Diffstat (limited to 'sys')
-rw-r--r--sys/linux/bpf.txt.const2
-rw-r--r--sys/linux/dev_ptmx.txt11
-rw-r--r--sys/linux/dev_ptmx.txt.const5
-rw-r--r--sys/linux/filesystem.txt.const4
-rw-r--r--sys/linux/sys.txt.const4
-rw-r--r--sys/syz-extract/extract.go2
6 files changed, 7 insertions, 21 deletions
diff --git a/sys/linux/bpf.txt.const b/sys/linux/bpf.txt.const
index 9a18b3eb3..629860170 100644
--- a/sys/linux/bpf.txt.const
+++ b/sys/linux/bpf.txt.const
@@ -243,7 +243,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 163
+__BPF_FUNC_MAX_ID = 164
__MAX_BPF_REG = 11
__NR_bpf = 280, 386:357, amd64:321, arm:386, mips64le:5315, ppc64le:361, s390x:351
bpf_call_code = 133
diff --git a/sys/linux/dev_ptmx.txt b/sys/linux/dev_ptmx.txt
index a03b24c58..03fd0d71e 100644
--- a/sys/linux/dev_ptmx.txt
+++ b/sys/linux/dev_ptmx.txt
@@ -162,10 +162,6 @@ ioctl$TIOCGPKT(fd fd_tty, cmd const[TIOCGPKT], arg ptr[out, int32])
ioctl$TIOCSIG(fd fd_tty, cmd const[TIOCSIG], arg signalnoptr)
ioctl$TIOCVHANGUP(fd fd_tty, cmd const[TIOCVHANGUP], arg const[0])
ioctl$TIOCGDEV(fd fd_tty, cmd const[TIOCGDEV], arg ptr[out, int32])
-ioctl$TCGETX(fd fd_tty, cmd const[TCGETX], arg ptr[out, termiox])
-ioctl$TCSETX(fd fd_tty, cmd const[TCSETX], arg ptr[in, termiox])
-ioctl$TCSETXF(fd fd_tty, cmd const[TCSETXF], arg ptr[in, termiox])
-ioctl$TCSETXW(fd fd_tty, cmd const[TCSETXW], arg ptr[in, termiox])
ioctl$TIOCMIWAIT(fd fd_tty, cmd const[TIOCMIWAIT], arg const[0])
ioctl$TIOCGICOUNT(fd fd_tty, cmd const[TIOCGICOUNT], arg const[0])
@@ -187,13 +183,6 @@ sgttyb {
tcxonc_arg = TCOOFF, TCOON, TCIOFF, TCION
-termiox {
- x_hflag int16
- x_cflag int16
- x_rflag array[int16, NFF]
- x_sflag int16
-}
-
termios {
c_iflag int32
c_oflag int32
diff --git a/sys/linux/dev_ptmx.txt.const b/sys/linux/dev_ptmx.txt.const
index 8a7467d48..a1d631afa 100644
--- a/sys/linux/dev_ptmx.txt.const
+++ b/sys/linux/dev_ptmx.txt.const
@@ -46,7 +46,6 @@ K_OFF = 4
K_RAW = 0
NCC = 8, ppc64le:10
NCCS = 19, mips64le:23
-NFF = 5
N_NULL = 27
N_TTY = 0
PIO_CMAP = 19313
@@ -61,7 +60,6 @@ TCFLSH = 21515, mips64le:21511, ppc64le:536900639
TCGETA = 21509, mips64le:21505, ppc64le:1075082263
TCGETS = 21505, mips64le:21517, ppc64le:1076655123
TCGETS2 = 2150388778, mips64le:1076909098, ppc64le:???
-TCGETX = 21554, mips64le:ppc64le:???
TCIFLUSH = 0
TCIOFF = 2
TCIOFLUSH = 2
@@ -79,9 +77,6 @@ TCSETSF = 21508, mips64le:21520, ppc64le:2150396950
TCSETSF2 = 1076646957, mips64le:2150650925, ppc64le:???
TCSETSW = 21507, mips64le:21519, ppc64le:2150396949
TCSETSW2 = 1076646956, mips64le:2150650924, ppc64le:???
-TCSETX = 21555, mips64le:ppc64le:???
-TCSETXF = 21556, mips64le:ppc64le:???
-TCSETXW = 21557, mips64le:ppc64le:???
TCXONC = 21514, mips64le:21510, ppc64le:536900638
TIOCCBRK = 21544
TIOCCONS = 21533, mips64le:2147775608
diff --git a/sys/linux/filesystem.txt.const b/sys/linux/filesystem.txt.const
index 7e0e4cb06..f6cbdb675 100644
--- a/sys/linux/filesystem.txt.const
+++ b/sys/linux/filesystem.txt.const
@@ -18,13 +18,13 @@ FSPICK_CLOEXEC = 1
MNT_DETACH = 2
MNT_EXPIRE = 4
MNT_FORCE = 1
+MOUNT_ATTR_IDMAP = 1048576
MOUNT_ATTR_NODEV = 4
MOUNT_ATTR_NODIRATIME = 128
MOUNT_ATTR_NOEXEC = 8
MOUNT_ATTR_NOSUID = 2
MOUNT_ATTR_RDONLY = 1
MOUNT_ATTR__ATIME = 112
-MOUNT_ATTR_IDMAP = 1048576
MOVE_MOUNT_F_AUTOMOUNTS = 2
MOVE_MOUNT_F_EMPTY_PATH = 4
MOVE_MOUNT_F_SYMLINKS = 1
@@ -63,7 +63,7 @@ __NR_fsmount = 432, mips64le:5432
__NR_fsopen = 430, mips64le:5430
__NR_fspick = 433, mips64le:5433
__NR_mount = 21, amd64:165, arm64:riscv64:40, mips64le:5160
+__NR_mount_setattr = 442, mips64le:5442
__NR_move_mount = 429, mips64le:5429
__NR_open_tree = 428, mips64le:5428
-__NR_mount_setattr = 442, mips64le:5442
__NR_umount2 = 52, amd64:166, arm64:riscv64:39, mips64le:5161
diff --git a/sys/linux/sys.txt.const b/sys/linux/sys.txt.const
index 56e3ec0b5..f6fa25260 100644
--- a/sys/linux/sys.txt.const
+++ b/sys/linux/sys.txt.const
@@ -394,8 +394,8 @@ PTRACE_SETREGSET = 16901
PTRACE_SETSIGINFO = 16899
PTRACE_SINGLESTEP = 9
PTRACE_SYSCALL = 24
-PTRACE_SYSEMU = 31, arm:mips64le:riscv64:s390x:???, ppc64le:29
-PTRACE_SYSEMU_SINGLESTEP = 32, arm:mips64le:riscv64:s390x:???, ppc64le:30
+PTRACE_SYSEMU = 31, arm:mips64le:riscv64:???, ppc64le:29
+PTRACE_SYSEMU_SINGLESTEP = 32, arm:mips64le:riscv64:???, ppc64le:30
PTRACE_TRACEME = 0
P_ALL = 0
P_PGID = 2
diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go
index 255c0e60b..00ab16cd8 100644
--- a/sys/syz-extract/extract.go
+++ b/sys/syz-extract/extract.go
@@ -270,6 +270,8 @@ func archFileList(os, arch string, files []string) (string, []string, []string,
// ION support was removed from kernel.
// We plan to leave the descriptions for some time as is and later remove them.
"dev_ion.txt": true,
+ // Not upstream, generated on unknown tree.
+ "dev_img_rogue.txt": true,
}
androidFiles := map[string]bool{
"dev_tlk_device.txt": true,