sys/linux: fix 240 warnings in descriptions

Sweeping fix of everything up to socket_netlink_route.txt. Update #590
google · Dec 20, 2019 · bc58691 · bc58691
1 parent f83f92f
commit bc58691
Show file tree

Hide file tree

Showing 74 changed files with 2,034 additions and 2,381 deletions.
diff --git a/executor/defs.h b/executor/defs.h
diff --git a/sys/linux/dev_cdrom.txt b/sys/linux/dev_cdrom.txt
@@ -320,9 +320,13 @@ cdrom_generic_command {
 }
 
 request_sense {
-	valid_err_code	int8
+	error_code	int8:7
+	valid		int8:1
 	segment_number	int8
-	ili_sense_key	int8
+	sense_key	int8:4
+	reserved2	const[0, int8:1]
+	ili		int8:1
+	reserved1	const[0, int8:2]
 	information	array[int8, 4]
 	add_sense_len	int8
 	command_info	array[int8, 4]

diff --git a/sys/linux/dev_cdrom.txt.warn b/sys/linux/dev_cdrom.txt.warn
@@ -1,24 +1,2 @@
 struct cdrom_msf_out_stub: no corresponding struct in kernel
 struct cdrom_addr: no corresponding struct in kernel
-struct request_sense: bad number of fields: syz=11 kernel=15
-field request_sense.valid_err_code/error_code: bad bit size/offset: syz=0/0 kernel=7/0
-field request_sense.segment_number/valid: bad bit size/offset: syz=0/0 kernel=1/7
-field request_sense.segment_number/valid: bad offset: syz=1 kernel=0
-field request_sense.ili_sense_key/segment_number: bad offset: syz=2 kernel=1
-field request_sense.information/sense_key: bad bit size/offset: syz=0/0 kernel=4/0
-field request_sense.information/sense_key: bad offset: syz=3 kernel=2
-field request_sense.information/sense_key: bad size: syz=4 kernel=1
-field request_sense.add_sense_len/reserved2: bad bit size/offset: syz=0/0 kernel=1/4
-field request_sense.add_sense_len/reserved2: bad offset: syz=7 kernel=2
-field request_sense.command_info/ili: bad bit size/offset: syz=0/0 kernel=1/5
-field request_sense.command_info/ili: bad offset: syz=8 kernel=2
-field request_sense.command_info/ili: bad size: syz=4 kernel=1
-field request_sense.asc/reserved1: bad bit size/offset: syz=0/0 kernel=2/6
-field request_sense.asc/reserved1: bad offset: syz=12 kernel=2
-field request_sense.ascq/information: bad offset: syz=13 kernel=3
-field request_sense.ascq/information: bad size: syz=1 kernel=4
-field request_sense.fruc/add_sense_len: bad offset: syz=14 kernel=7
-field request_sense.sks/command_info: bad offset: syz=15 kernel=8
-field request_sense.sks/command_info: bad size: syz=3 kernel=4
-field request_sense.asb/asc: bad offset: syz=18 kernel=12
-field request_sense.asb/asc: bad size: syz=46 kernel=1
diff --git a/sys/linux/dev_kvm.txt b/sys/linux/dev_kvm.txt
@@ -659,17 +659,17 @@ kvm_dtable {
 }
 
 kvm_fpu {
-	fpr	array[const[0, int64], 16]
-	fcw	int16
-	fsw	int8
-	ftws	int8
-	pad1	const[0, int8]
-	opcode	int16
-	lastip	flags[kvm_guest_addrs, int64]
-	lastdp	flags[kvm_guest_addrs, int64]
-	xmm	array[const[0, int64], 32]
-	mxcsr	int32
-	pad2	const[0, int32]
+	fpr		array[const[0, int64], 16]
+	fcw		int16
+	fsw		int16
+	ftws		int8
+	pad1		const[0, int8]
+	last_opcode	int16
+	last_ip		flags[kvm_guest_addrs, int64]
+	last_dp		flags[kvm_guest_addrs, int64]
+	xmm		array[const[0, int64], 32]
+	mxcsr		int32
+	pad2		const[0, int32]
 }
 
 kvm_debugregs {

diff --git a/sys/linux/dev_kvm.txt.warn b/sys/linux/dev_kvm.txt.warn
@@ -49,9 +49,6 @@ struct kvm_regs: bad number of fields: syz=3 kernel=18
 field kvm_regs.gp/rax: bad size: syz=128 kernel=8
 field kvm_regs.rip/rbx: bad offset: syz=128 kernel=8
 field kvm_regs.rflags/rcx: bad offset: syz=136 kernel=16
-field kvm_fpu.fsw: bad size: syz=1 kernel=2
-field kvm_fpu.ftws/ftwx: bad offset: syz=131 kernel=132
-field kvm_fpu.pad1: bad offset: syz=132 kernel=133
 struct kvm_irq_chip: no corresponding struct in kernel
 struct kvm_ioapic_redir: no corresponding struct in kernel
 struct kvm_mce_cap: no corresponding struct in kernel

diff --git a/sys/linux/dev_ptmx.txt b/sys/linux/dev_ptmx.txt
@@ -124,7 +124,7 @@ ioctl$VT_RESIZE(fd fd_tty, cmd const[VT_RESIZE], arg ptr[in, vt_sizes])
 ioctl$VT_RESIZEX(fd fd_tty, cmd const[VT_RESIZEX], arg ptr[in, vt_consize])
 
 # For the TIOCLINUX ioctl, see console_ioctl(4).
-ioctl$TIOCL_SETSEL(fd fd_tty, cmd const[TIOCLINUX], arg ptr[in, tiocl_selection])
+ioctl$TIOCL_SETSEL(fd fd_tty, cmd const[TIOCLINUX], arg ptr[in, tiocl_selection_arg])
 ioctl$TIOCL_PASTESEL(fd fd_tty, cmd const[TIOCLINUX], arg ptr[in, const[TIOCL_PASTESEL, int8]])
 ioctl$TIOCL_UNBLANKSCREEN(fd fd_tty, cmd const[TIOCLINUX], arg ptr[in, const[TIOCL_UNBLANKSCREEN, int8]])
 ioctl$TIOCL_SELLOADLUT(fd fd_tty, cmd const[TIOCLINUX], arg ptr[in, loadlut])
@@ -166,18 +166,12 @@ termiox {
 }
 
 termios {
-	iflag	int32
-	oflag	int32
-	cflag	int32
-	lflag	int32
-	line	int8[N_TTY:N_NULL]
-	cc0	int8
-	cc1	int8
-	cc2	int8
-	cc3_6	int32
-	cc7_10	int32
-	cc11_14	int32
-	cc15_18	int32
+	c_iflag	int32
+	c_oflag	int32
+	c_cflag	int32
+	c_lflag	int32
+	c_line	int8[N_TTY:N_NULL]
+	c_cc	array[int8, NCCS]
 }
 
 termios2 {
@@ -192,16 +186,12 @@ termios2 {
 }
 
 termio {
-	iflag	int16
-	oflag	int16
-	cflag	int16
-	lflag	int16
-	line	int8[N_TTY:N_NULL]
-	cc0	int8
-	cc1	int8
-	cc2	int8
-	cc3_6	int32
-	cc7	int8
+	c_iflag	int16
+	c_oflag	int16
+	c_cflag	int16
+	c_lflag	int16
+	c_line	int8[N_TTY:N_NULL]
+	c_cc	array[int8, NCC]
 }
 
 winsize {
@@ -286,6 +276,11 @@ vt_consize {
 	ccol	int16
 }
 
+tiocl_selection_arg {
+	subcode	const[TIOCL_SETSEL, int8]
+	data	tiocl_selection
+} [packed]
+
 tiocl_selection {
 	subcode	const[TIOCL_SETSEL, int8]
 	xs	int16
@@ -324,7 +319,7 @@ serial_struct {
 	xmit_fifo_size	int32
 	custom_divisor	int32
 	baud_base	int32
-	close_delay	int32
+	close_delay	int16
 	io_type		int8
 	reserved_char	int8
 	hub6		int32

diff --git a/sys/linux/dev_ptmx.txt.warn b/sys/linux/dev_ptmx.txt.warn
@@ -1,12 +1,8 @@
-struct termios: bad number of fields: syz=12 kernel=6
-field termios.cc0/c_cc: bad size: syz=1 kernel=19
-struct termio: bad number of fields: syz=10 kernel=6
-struct termio: bad size: syz=20 kernel=18
-field termio.cc0/c_cc: bad size: syz=1 kernel=8
 struct io_cmap: no corresponding struct in kernel
 struct unimapdesc_in: no corresponding struct in kernel
 struct unimapdesc_out: no corresponding struct in kernel
 struct unimapinit: no corresponding struct in kernel
+struct tiocl_selection_arg: no corresponding struct in kernel
 struct tiocl_selection: bad number of fields: syz=6 kernel=5
 struct tiocl_selection: bad size: syz=11 kernel=10
 field tiocl_selection.subcode/xs: bad size: syz=1 kernel=2
@@ -17,9 +13,3 @@ field tiocl_selection.ye/sel_mode: bad offset: syz=7 kernel=8
 struct loadlut: no corresponding struct in kernel
 struct tiocl_shift_state: no corresponding struct in kernel
 struct tioctl_scroll_console: no corresponding struct in kernel
-field serial_struct.close_delay: bad size: syz=4 kernel=2
-field serial_struct.io_type: bad offset: syz=36 kernel=34
-field serial_struct.reserved_char: bad offset: syz=37 kernel=35
-field serial_struct.hub6: bad offset: syz=40 kernel=36
-field serial_struct.closing_wait: bad offset: syz=44 kernel=40
-field serial_struct.closing_wait2: bad offset: syz=46 kernel=42
diff --git a/sys/linux/dev_ptmx_386.const b/sys/linux/dev_ptmx_386.const
@@ -43,6 +43,7 @@ K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
 K_RAW = 0
+NCC = 8
 NCCS = 19
 NFF = 5
 N_NULL = 27

diff --git a/sys/linux/dev_ptmx_amd64.const b/sys/linux/dev_ptmx_amd64.const
@@ -43,6 +43,7 @@ K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
 K_RAW = 0
+NCC = 8
 NCCS = 19
 NFF = 5
 N_NULL = 27

diff --git a/sys/linux/dev_ptmx_arm.const b/sys/linux/dev_ptmx_arm.const
@@ -43,6 +43,7 @@ K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
 K_RAW = 0
+NCC = 8
 NCCS = 19
 NFF = 5
 N_NULL = 27

diff --git a/sys/linux/dev_ptmx_arm64.const b/sys/linux/dev_ptmx_arm64.const
@@ -43,6 +43,7 @@ K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
 K_RAW = 0
+NCC = 8
 NCCS = 19
 NFF = 5
 N_NULL = 27

diff --git a/sys/linux/dev_ptmx_mips64le.const b/sys/linux/dev_ptmx_mips64le.const
@@ -43,6 +43,7 @@ K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
 K_RAW = 0
+NCC = 8
 NCCS = 23
 NFF = 5
 N_NULL = 27

diff --git a/sys/linux/dev_ptmx_ppc64le.const b/sys/linux/dev_ptmx_ppc64le.const
@@ -43,6 +43,7 @@ K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
 K_RAW = 0
+NCC = 10
 NCCS = 19
 NFF = 5
 N_NULL = 27

diff --git a/sys/linux/dev_ptp.txt b/sys/linux/dev_ptp.txt
@@ -45,14 +45,14 @@ ptp_perout_request {
 ptp_sys_offset {
 	n_samples	int32[0:PTP_MAX_SAMPLES]
 	rsv		array[const[0, int32], 3]
-# Nothing interesting/input beyond this point.
-} [size[PTP_SYS_OFFSET_SIZE]]
+	ts		array[const[0, int64], 102]
+}
 
 ptp_sys_offset_extended {
 	n_samples	int32[0:PTP_MAX_SAMPLES]
 	rsv		array[const[0, int32], 3]
-# Nothing interesting/input beyond this point.
-} [size[PTP_SYS_OFFSET_EXTENDED_SIZE]]
+	ts		array[const[0, int64], 150]
+}
 
 ptp_pin_desc {
 	name	array[const[0, int8], 64]
@@ -72,6 +72,4 @@ ptp_extts_request_flags = PTP_ENABLE_FEATURE, PTP_RISING_EDGE, PTP_FALLING_EDGE,
 ptp_pin_pf = PTP_PF_NONE, PTP_PF_EXTTS, PTP_PF_PEROUT, PTP_PF_PHYSYNC
 
 define PTP_CLOCK_CAPS_SIZE	sizeof(struct ptp_clock_caps)
-define PTP_SYS_OFFSET_SIZE	sizeof(struct ptp_sys_offset)
 define PTP_SYS_OFFSET_PRECISE_SIZE	sizeof(struct ptp_sys_offset_precise)
-define PTP_SYS_OFFSET_EXTENDED_SIZE	sizeof(struct ptp_sys_offset_extended)
diff --git a/sys/linux/dev_ptp.txt.warn b/sys/linux/dev_ptp.txt.warn
diff --git a/sys/linux/dev_ptp_386.const b/sys/linux/dev_ptp_386.const
@@ -22,10 +22,8 @@ PTP_RISING_EDGE = 2
 PTP_STRICT_FLAGS = 8
 PTP_SYS_OFFSET = 1128283397
 PTP_SYS_OFFSET_EXTENDED = 3300932873
-PTP_SYS_OFFSET_EXTENDED_SIZE = 1216
 PTP_SYS_OFFSET_PRECISE = 3225435400
 PTP_SYS_OFFSET_PRECISE_SIZE = 64
-PTP_SYS_OFFSET_SIZE = 832
 __NR_ioctl = 54
 __NR_openat = 295
 __NR_read = 3
diff --git a/sys/linux/dev_ptp_amd64.const b/sys/linux/dev_ptp_amd64.const
@@ -22,10 +22,8 @@ PTP_RISING_EDGE = 2
 PTP_STRICT_FLAGS = 8
 PTP_SYS_OFFSET = 1128283397
 PTP_SYS_OFFSET_EXTENDED = 3300932873
-PTP_SYS_OFFSET_EXTENDED_SIZE = 1216
 PTP_SYS_OFFSET_PRECISE = 3225435400
 PTP_SYS_OFFSET_PRECISE_SIZE = 64
-PTP_SYS_OFFSET_SIZE = 832
 __NR_ioctl = 16
 __NR_openat = 257
 __NR_read = 0
diff --git a/sys/linux/dev_ptp_arm.const b/sys/linux/dev_ptp_arm.const
@@ -22,10 +22,8 @@ PTP_RISING_EDGE = 2
 PTP_STRICT_FLAGS = 8
 PTP_SYS_OFFSET = 1128283397
 PTP_SYS_OFFSET_EXTENDED = 3300932873
-PTP_SYS_OFFSET_EXTENDED_SIZE = 1216
 PTP_SYS_OFFSET_PRECISE = 3225435400
 PTP_SYS_OFFSET_PRECISE_SIZE = 64
-PTP_SYS_OFFSET_SIZE = 832
 __NR_ioctl = 54
 __NR_openat = 322
 __NR_read = 3
diff --git a/sys/linux/dev_ptp_arm64.const b/sys/linux/dev_ptp_arm64.const
@@ -22,10 +22,8 @@ PTP_RISING_EDGE = 2
 PTP_STRICT_FLAGS = 8
 PTP_SYS_OFFSET = 1128283397
 PTP_SYS_OFFSET_EXTENDED = 3300932873
-PTP_SYS_OFFSET_EXTENDED_SIZE = 1216
 PTP_SYS_OFFSET_PRECISE = 3225435400
 PTP_SYS_OFFSET_PRECISE_SIZE = 64
-PTP_SYS_OFFSET_SIZE = 832
 __NR_ioctl = 29
 __NR_openat = 56
 __NR_read = 63
diff --git a/sys/linux/dev_ptp_mips64le.const b/sys/linux/dev_ptp_mips64le.const
@@ -22,10 +22,8 @@ PTP_RISING_EDGE = 2
 PTP_STRICT_FLAGS = 8
 PTP_SYS_OFFSET = 2202025221
 PTP_SYS_OFFSET_EXTENDED = 3300932873
-PTP_SYS_OFFSET_EXTENDED_SIZE = 1216
 PTP_SYS_OFFSET_PRECISE = 3225435400
 PTP_SYS_OFFSET_PRECISE_SIZE = 64
-PTP_SYS_OFFSET_SIZE = 832
 __NR_ioctl = 5015
 __NR_openat = 5247
 __NR_read = 5000
diff --git a/sys/linux/dev_ptp_ppc64le.const b/sys/linux/dev_ptp_ppc64le.const
@@ -22,10 +22,8 @@ PTP_RISING_EDGE = 2
 PTP_STRICT_FLAGS = 8
 PTP_SYS_OFFSET = 2202025221
 PTP_SYS_OFFSET_EXTENDED = 3300932873
-PTP_SYS_OFFSET_EXTENDED_SIZE = 1216
 PTP_SYS_OFFSET_PRECISE = 3225435400
 PTP_SYS_OFFSET_PRECISE_SIZE = 64
-PTP_SYS_OFFSET_SIZE = 832
 __NR_ioctl = 54
 __NR_openat = 286
 __NR_read = 3