Skip to content

Commit

Permalink
sys/linux: fix warning in dev_video4linux.txt
Browse files Browse the repository at this point in the history
Update #590
  • Loading branch information
dvyukov committed Dec 22, 2019
1 parent 8fecec2 commit 9b81e6b
Show file tree
Hide file tree
Showing 8 changed files with 253 additions and 211 deletions.
10 changes: 5 additions & 5 deletions executor/defs.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 25 additions & 16 deletions sys/linux/dev_video4linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ include <uapi/linux/v4l2-controls.h>
resource fd_video[fd]
resource fd_dmabuf[fd]
resource fd_v4l2_buffer[fd]
resource v4l2_std_id[int64]

syz_open_dev$video(dev ptr[in, string["/dev/video#"]], id intptr, flags flags[open_flags]) fd_video
syz_open_dev$video4linux(dev ptr[in, string["/dev/v4l-subdev#"]], id intptr, flags flags[open_flags]) fd_video
Expand Down Expand Up @@ -145,8 +144,8 @@ ioctl$VIDIOC_SUBDEV_DV_TIMINGS_CAP(fd fd_video, cmd const[VIDIOC_SUBDEV_DV_TIMIN

v4l2_capability {
driver array[int8, 16]
card array[int8, 16]
bus_version array[int8, 32]
card array[int8, 32]
bus_info array[int8, 32]
version int32
capabilities flags[v4l2_capability_capabilities, int32]
device_caps int32
Expand Down Expand Up @@ -263,22 +262,24 @@ v4l2_requestbuffers {
count int32
type flags[v4l2_buf_type, int32]
memory flags[v4l2_memory, int32]
reserved array[const[0, int32], 2]
capabilities const[0, int32]
reserved const[0, int32]
}

v4l2_buffer {
index int32
type flags[v4l2_buf_type, int32]
bytesused len[type, int32]
flags flags[v4l2_buffer_flags, int32]
field int32
timestamp timeval
timecode v4l2_timecode
sequence int32
memory flags[v4l2_memory, int32]
m v4l2_buffer_union
length len[type, int32]
length int32
reserved2 const[0, int32]
reserved const[0, int32]
request_fd fd[opt]
}

v4l2_buffer_union [
Expand Down Expand Up @@ -491,7 +492,8 @@ v4l2_ext_controls {
ctrl_class flags[v4l2_ext_ctrl_class, int32]
count int32
error_idx int32
reserved array[const[0, int32], 2]
request_fd fd[opt]
reserved const[0, int32]
controls ptr[inout, v4l2_ext_control]
}

Expand Down Expand Up @@ -630,7 +632,10 @@ v4l2_bt_timings {
il_vbackporch int32
standards flags[v4l2_bt_timings_standards, int32]
flags flags[v4l2_bt_timings_flags, int32]
reserved array[const[0, int32], 14]
picture_aspect v4l2_fract
cea861_vic int8
hdmi_vic int8
reserved array[const[0, int8], 46]
} [packed]

v4l2_encoder_cmd {
Expand Down Expand Up @@ -704,7 +709,8 @@ v4l2_create_buffers {
count int32
memory flags[v4l2_memory, int32]
format v4l2_format
reserved array[const[0, int32], 8]
capabilities int32
reserved array[const[0, int32], 7]
}

v4l2_selection {
Expand Down Expand Up @@ -797,9 +803,11 @@ v4l2_query_ext_ctrl {
reserved array[const[0, int32], 32]
}

type v4l2_std_id flags[v4l2_std_id, int64]

v4l2_standard {
index int32
id flags[v4l2_standard_std, int32]
id v4l2_std_id
name array[int8, 24]
frameperiod v4l2_fract
framelines int32
Expand All @@ -812,7 +820,7 @@ v4l2_input {
type flags[v4l2_input_type, int32]
audioset int32
tuner flags[v4l2_tuner_type, int32]
std flags[v4l2_standard_std, int32]
std v4l2_std_id
status flags[v4l2_input_status, int32]
capabilities flags[v4l2_input_capabilities, int32]
reserved array[const[0, int32], 3]
Expand All @@ -824,7 +832,7 @@ v4l2_output {
type flags[v4l2_output_type, int32]
audioset int32
modulator int32
std flags[v4l2_standard_std, int32]
std v4l2_std_id
capabilities flags[v4l2_output_capabilities, int32]
reserved array[const[0, int32], 3]
}
Expand All @@ -842,9 +850,10 @@ v4l2_mbus_framefmt {
code flags[media_bus_fmt, int32]
field flags[v4l2_field, int32]
colorspace flags[v4l2_colorspace, int32]
ycbcr_enc flags[v4l2_ycbcr_encoding, int32]
quantization flags[v4l2_quantization, int32]
xfer_func flags[v4l2_xfer_func, int32]
ycbcr_enc flags[v4l2_ycbcr_encoding, int16]
quantization flags[v4l2_quantization, int16]
xfer_func flags[v4l2_xfer_func, int16]
reserved array[const[0, int16], 11]
}

v4l2_subdev_frame_interval {
Expand Down Expand Up @@ -960,7 +969,7 @@ v4l2_selection_target = V4L2_SEL_TGT_CROP, V4L2_SEL_TGT_CROP_DEFAULT, V4L2_SEL_T
v4l2_selection_flags = V4L2_SEL_FLAG_GE, V4L2_SEL_FLAG_LE, V4L2_SEL_FLAG_KEEP_CONFIG, V4L2_SUBDEV_SEL_FLAG_SIZE_GE, V4L2_SUBDEV_SEL_FLAG_SIZE_LE, V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG
v4l2_bt_timings_cap_capabilities = V4L2_DV_BT_CAP_INTERLACED, V4L2_DV_BT_CAP_PROGRESSIVE, V4L2_DV_BT_CAP_REDUCED_BLANKING, V4L2_DV_BT_CAP_CUSTOM
v4l2_dbg_chip_info_flags = V4L2_CHIP_FL_READABLE, V4L2_CHIP_FL_WRITABLE
v4l2_standard_std = V4L2_STD_PAL_B, V4L2_STD_PAL_B1, V4L2_STD_PAL_G, V4L2_STD_PAL_H, V4L2_STD_PAL_I, V4L2_STD_PAL_D, V4L2_STD_PAL_D1, V4L2_STD_PAL_K, V4L2_STD_PAL_M, V4L2_STD_PAL_N, V4L2_STD_PAL_Nc, V4L2_STD_PAL_60, V4L2_STD_NTSC_M, V4L2_STD_NTSC_M_JP, V4L2_STD_NTSC_443, V4L2_STD_NTSC_M_KR, V4L2_STD_SECAM_B, V4L2_STD_SECAM_D, V4L2_STD_SECAM_G, V4L2_STD_SECAM_H, V4L2_STD_SECAM_K, V4L2_STD_SECAM_K1, V4L2_STD_SECAM_L, V4L2_STD_SECAM_LC, V4L2_STD_ATSC_8_VSB, V4L2_STD_ATSC_16_VSB, V4L2_STD_NTSC, V4L2_STD_SECAM_DK, V4L2_STD_SECAM, V4L2_STD_PAL_BG, V4L2_STD_PAL_DK, V4L2_STD_PAL, V4L2_STD_B, V4L2_STD_G, V4L2_STD_H, V4L2_STD_L, V4L2_STD_GH, V4L2_STD_DK, V4L2_STD_BG, V4L2_STD_MN, V4L2_STD_MTS, V4L2_STD_525_60, V4L2_STD_625_50, V4L2_STD_ATSC, V4L2_STD_UNKNOWN, V4L2_STD_ALL
v4l2_std_id = V4L2_STD_PAL_B, V4L2_STD_PAL_B1, V4L2_STD_PAL_G, V4L2_STD_PAL_H, V4L2_STD_PAL_I, V4L2_STD_PAL_D, V4L2_STD_PAL_D1, V4L2_STD_PAL_K, V4L2_STD_PAL_M, V4L2_STD_PAL_N, V4L2_STD_PAL_Nc, V4L2_STD_PAL_60, V4L2_STD_NTSC_M, V4L2_STD_NTSC_M_JP, V4L2_STD_NTSC_443, V4L2_STD_NTSC_M_KR, V4L2_STD_SECAM_B, V4L2_STD_SECAM_D, V4L2_STD_SECAM_G, V4L2_STD_SECAM_H, V4L2_STD_SECAM_K, V4L2_STD_SECAM_K1, V4L2_STD_SECAM_L, V4L2_STD_SECAM_LC, V4L2_STD_ATSC_8_VSB, V4L2_STD_ATSC_16_VSB, V4L2_STD_NTSC, V4L2_STD_SECAM_DK, V4L2_STD_SECAM, V4L2_STD_PAL_BG, V4L2_STD_PAL_DK, V4L2_STD_PAL, V4L2_STD_B, V4L2_STD_G, V4L2_STD_H, V4L2_STD_L, V4L2_STD_GH, V4L2_STD_DK, V4L2_STD_BG, V4L2_STD_MN, V4L2_STD_MTS, V4L2_STD_525_60, V4L2_STD_625_50, V4L2_STD_ATSC, V4L2_STD_UNKNOWN, V4L2_STD_ALL
v4l2_input_status = V4L2_IN_ST_NO_POWER, V4L2_IN_ST_NO_SIGNAL, V4L2_IN_ST_NO_COLOR, V4L2_IN_ST_HFLIP, V4L2_IN_ST_VFLIP, V4L2_IN_ST_NO_H_LOCK, V4L2_IN_ST_COLOR_KILL, V4L2_IN_ST_NO_V_LOCK, V4L2_IN_ST_NO_STD_LOCK, V4L2_IN_ST_NO_SYNC, V4L2_IN_ST_NO_EQU, V4L2_IN_ST_NO_CARRIER, V4L2_IN_ST_MACROVISION, V4L2_IN_ST_NO_ACCESS, V4L2_IN_ST_VTR
v4l2_input_type = V4L2_INPUT_TYPE_TUNER, V4L2_INPUT_TYPE_CAMERA, V4L2_INPUT_TYPE_TOUCH
v4l2_input_capabilities = V4L2_IN_CAP_DV_TIMINGS, V4L2_IN_CAP_CUSTOM_TIMINGS, V4L2_IN_CAP_STD, V4L2_IN_CAP_NATIVE_SIZE
Expand Down
55 changes: 0 additions & 55 deletions sys/linux/dev_video4linux.txt.warn
Original file line number Diff line number Diff line change
@@ -1,71 +1,16 @@
struct v4l2_capability: bad size: syz=88 kernel=104
field v4l2_capability.card: bad size: syz=16 kernel=32
field v4l2_capability.bus_version/bus_info: bad offset: syz=32 kernel=48
field v4l2_capability.version: bad offset: syz=64 kernel=80
field v4l2_capability.capabilities: bad offset: syz=68 kernel=84
field v4l2_capability.device_caps: bad offset: syz=72 kernel=88
field v4l2_capability.reserved: bad offset: syz=76 kernel=92
struct v4l2_format_fmt: no corresponding struct in kernel
struct v4l2_requestbuffers: bad number of fields: syz=4 kernel=5
field v4l2_requestbuffers.reserved/capabilities: bad size: syz=8 kernel=4
struct v4l2_buffer: bad number of fields: syz=12 kernel=13
struct v4l2_buffer: bad size: syz=80 kernel=88
field v4l2_buffer.timestamp/field: bad size: syz=16 kernel=4
field v4l2_buffer.timecode/timestamp: bad offset: syz=32 kernel=24
field v4l2_buffer.sequence/timecode: bad offset: syz=48 kernel=40
field v4l2_buffer.sequence/timecode: bad size: syz=4 kernel=16
field v4l2_buffer.memory/sequence: bad offset: syz=52 kernel=56
field v4l2_buffer.m/memory: bad offset: syz=56 kernel=60
field v4l2_buffer.m/memory: bad size: syz=8 kernel=4
field v4l2_buffer.length/m: bad size: syz=4 kernel=8
field v4l2_buffer.reserved2/length: bad offset: syz=68 kernel=72
field v4l2_buffer.reserved/reserved2: bad offset: syz=72 kernel=76
struct v4l2_buffer_union: no corresponding struct in kernel
struct v4l2_plane_union: no corresponding struct in kernel
struct v4l2_framebuffer_union: no corresponding struct in kernel
struct v4l2_streamparm_union: no corresponding struct in kernel
struct v4l2_querymenu_union: no corresponding struct in kernel
struct v4l2_ext_controls: bad number of fields: syz=5 kernel=6
field v4l2_ext_controls.reserved/request_fd: bad size: syz=8 kernel=4
field v4l2_ext_controls.controls/reserved: bad offset: syz=24 kernel=16
field v4l2_ext_controls.controls/reserved: bad size: syz=8 kernel=4
struct v4l2_ext_u: no corresponding struct in kernel
struct v4l2_frmsizeenum_union: no corresponding struct in kernel
struct v4l2_frmivalenum_union: no corresponding struct in kernel
struct v4l2_dbg_match_union: no corresponding struct in kernel
struct v4l2_dv_timings_union: no corresponding struct in kernel
struct v4l2_bt_timings: bad number of fields: syz=17 kernel=20
field v4l2_bt_timings.reserved/picture_aspect: bad size: syz=56 kernel=8
struct v4l2_event_union: no corresponding struct in kernel
struct v4l2_event_ctrl_union: no corresponding struct in kernel
struct v4l2_create_buffers: bad number of fields: syz=5 kernel=6
field v4l2_create_buffers.reserved/capabilities: bad size: syz=32 kernel=4
struct v4l2_decoder_cmd_u: no corresponding struct in kernel
struct v4l2_decoder_cmd_start: no corresponding struct in kernel
struct v4l2_dv_timings_cap_u: no corresponding struct in kernel
struct v4l2_standard: bad size: syz=60 kernel=72
field v4l2_standard.id: bad offset: syz=4 kernel=8
field v4l2_standard.id: bad size: syz=4 kernel=8
field v4l2_standard.name: bad offset: syz=8 kernel=16
field v4l2_standard.frameperiod: bad offset: syz=32 kernel=40
field v4l2_standard.framelines: bad offset: syz=40 kernel=48
field v4l2_standard.reserved: bad offset: syz=44 kernel=52
struct v4l2_input: bad size: syz=72 kernel=80
field v4l2_input.std: bad size: syz=4 kernel=8
field v4l2_input.status: bad offset: syz=52 kernel=56
field v4l2_input.capabilities: bad offset: syz=56 kernel=60
field v4l2_input.reserved: bad offset: syz=60 kernel=64
struct v4l2_output: bad size: syz=68 kernel=72
field v4l2_output.std: bad size: syz=4 kernel=8
field v4l2_output.capabilities: bad offset: syz=52 kernel=56
field v4l2_output.reserved: bad offset: syz=56 kernel=60
struct v4l2_subdev_format: bad size: syz=72 kernel=88
field v4l2_subdev_format.format: bad size: syz=32 kernel=48
field v4l2_subdev_format.reserved: bad offset: syz=40 kernel=56
struct v4l2_mbus_framefmt: bad number of fields: syz=8 kernel=9
struct v4l2_mbus_framefmt: bad size: syz=32 kernel=48
field v4l2_mbus_framefmt.ycbcr_enc: bad size: syz=4 kernel=2
field v4l2_mbus_framefmt.quantization: bad offset: syz=24 kernel=22
field v4l2_mbus_framefmt.quantization: bad size: syz=4 kernel=2
field v4l2_mbus_framefmt.xfer_func: bad offset: syz=28 kernel=24
field v4l2_mbus_framefmt.xfer_func: bad size: syz=4 kernel=2
Loading

0 comments on commit 9b81e6b

Please sign in to comment.