diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-06-13 20:50:20 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-06-13 20:50:20 +0200 |
| commit | a61674a581eb1b73f153086698d4aea066dcd41b (patch) | |
| tree | a3ecf72f691e574a76411aed65f275aba13c8415 | |
| parent | 6378506674c8c6658bcb403c8141481e5336d4c0 (diff) | |
sys/linux: fix some warnings in descriptions
syz-check pointed to a new batch of bugs in descriptions.
Fix them.
| -rw-r--r-- | sys/linux/dev_kvm.txt | 10 | ||||
| -rw-r--r-- | sys/linux/dev_kvm.txt.warn | 4 | ||||
| -rw-r--r-- | sys/linux/dev_vfio.txt | 1 | ||||
| -rw-r--r-- | sys/linux/dev_vfio.txt.warn | 2 | ||||
| -rw-r--r-- | sys/linux/socket_ipx.txt | 4 | ||||
| -rw-r--r-- | sys/linux/socket_ipx.txt.warn | 3 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack.txt | 7 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack_386.const | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack_amd64.const | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack_arm.const | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack_arm64.const | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack_mips64le.const | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_netfilter_conntrack_ppc64le.const | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_route_sched.txt | 1 |
14 files changed, 41 insertions, 15 deletions
diff --git a/sys/linux/dev_kvm.txt b/sys/linux/dev_kvm.txt index 5fcfd044b..290191a45 100644 --- a/sys/linux/dev_kvm.txt +++ b/sys/linux/dev_kvm.txt @@ -393,6 +393,7 @@ kvm_assigned_msix_entry { devid int32 gsi int32 entry int16 + padding array[const[0, int16], 3] } kvm_assigned_msix_nr { @@ -447,10 +448,11 @@ kvm_irq_routing_hv_sint { } kvm_assigned_irq { - devid int32 - hirq int32 - girq int32 - flags flags[kvm_assigned_irq_flags, int32] + assigned_dev_id int32 + host_irq const[0, int32] + guest_irq int32 + flags flags[kvm_assigned_irq_flags, int32] + reserved array[const[0, int32], 12] } kvm_assigned_pci_dev { diff --git a/sys/linux/dev_kvm.txt.warn b/sys/linux/dev_kvm.txt.warn index 85f0ffe04..5553cc1bc 100644 --- a/sys/linux/dev_kvm.txt.warn +++ b/sys/linux/dev_kvm.txt.warn @@ -43,12 +43,8 @@ no-such-struct: kvm_setup_opt_arm64 [386,amd64,arm64] no-such-struct: kvm_setup_opt_feature [386,amd64,arm64] bad-struct-size: kvm_guest_debug: syz=72 kernel=520 [arm64] bad-field-size: kvm_guest_debug.reg/arch: syz=64 kernel=512 [arm64] -bad-field-number: kvm_assigned_msix_entry: syz=3 kernel=4 [386,amd64,arm64] -bad-struct-size: kvm_assigned_msix_entry: syz=12 kernel=16 [386,amd64,arm64] bad-field-number: kvm_assigned_msix_nr: syz=2 kernel=3 [386,amd64,arm64] no-such-struct: kvm_irq_routing_entry_u [386,amd64,arm64] -bad-field-number: kvm_assigned_irq: syz=4 kernel=5 [386,amd64,arm64] -bad-struct-size: kvm_assigned_irq: syz=16 kernel=64 [386,amd64,arm64] bad-field-number: kvm_assigned_pci_dev: syz=5 kernel=6 [386,amd64,arm64] bad-struct-size: kvm_assigned_pci_dev: syz=20 kernel=64 [386,amd64,arm64] no-such-struct: kvm_enable_cap_cpu [386,amd64,arm64] diff --git a/sys/linux/dev_vfio.txt b/sys/linux/dev_vfio.txt index 2b0fc6626..ef78ec10b 100644 --- a/sys/linux/dev_vfio.txt +++ b/sys/linux/dev_vfio.txt @@ -43,6 +43,7 @@ vfio_iommu_type1_dma_unmap { flags flags[vfio_dma_flags, int32] iova int64 size int64 + data array[int8] } iommu_flags = VFIO_TYPE1_IOMMU, VFIO_SPAPR_TCE_IOMMU, VFIO_TYPE1v2_IOMMU, VFIO_DMA_CC_IOMMU, VFIO_EEH, VFIO_TYPE1_NESTING_IOMMU, VFIO_SPAPR_TCE_v2_IOMMU, VFIO_NOIOMMU_IOMMU diff --git a/sys/linux/dev_vfio.txt.warn b/sys/linux/dev_vfio.txt.warn index 4b919cda0..d0f1f64c9 100644 --- a/sys/linux/dev_vfio.txt.warn +++ b/sys/linux/dev_vfio.txt.warn @@ -1,4 +1,2 @@ no-such-struct: vfio_iommu_type1_info [arm] no-such-struct: vfio_iommu_type1_dma_map [arm] -bad-field-number: vfio_iommu_type1_dma_unmap: syz=4 kernel=5 [386,amd64,arm64] -no-such-struct: vfio_iommu_type1_dma_unmap [arm] diff --git a/sys/linux/socket_ipx.txt b/sys/linux/socket_ipx.txt index 141b36f12..af15b48e2 100644 --- a/sys/linux/socket_ipx.txt +++ b/sys/linux/socket_ipx.txt @@ -48,6 +48,6 @@ ioctl$sock_ipx_SIOCIPXCFGDATA(fd sock_ipx, cmd const[SIOCIPXCFGDATA], arg ptr[ou ioctl$sock_ipx_SIOCIPXNCPCONN(fd sock_ipx, cmd const[SIOCIPXNCPCONN], arg ptr[in, int16]) ipx_config_data { - ipxcfg_auto_select_primary int16 - ipxcfg_auto_create_interfaces int16 + ipxcfg_auto_select_primary int8 + ipxcfg_auto_create_interfaces int8 } diff --git a/sys/linux/socket_ipx.txt.warn b/sys/linux/socket_ipx.txt.warn deleted file mode 100644 index 8b3f4d9b5..000000000 --- a/sys/linux/socket_ipx.txt.warn +++ /dev/null @@ -1,3 +0,0 @@ -bad-struct-size: ipx_config_data: syz=4 kernel=2 -bad-field-size: ipx_config_data.ipxcfg_auto_select_primary: syz=2 kernel=1 -bad-field-offset: ipx_config_data.ipxcfg_auto_create_interfaces: syz=2 kernel=1 diff --git a/sys/linux/socket_netlink_netfilter_conntrack.txt b/sys/linux/socket_netlink_netfilter_conntrack.txt index fa9c9ef42..4db2300bc 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack.txt +++ b/sys/linux/socket_netlink_netfilter_conntrack.txt @@ -42,6 +42,7 @@ ct_nla_policy [ CTA_LABELS_MASK nlattr[CTA_LABELS_MASK, array[int32be]] CTA_SEQ_ADJ_ORIG nlnest[CTA_SEQ_ADJ_ORIG, array[seqadj_policy]] CTA_SEQ_ADJ_REPLY nlnest[CTA_SEQ_ADJ_REPLY, array[seqadj_policy]] + CTA_SYNPROXY nlnest[CTA_SYNPROXY, array[synproxy_policy]] ] [varlen] seqadj_policy [ @@ -115,5 +116,11 @@ protonat_nla_policy [ CTA_PROTONAT_PORT_MAX nlattr[CTA_PROTONAT_PORT_MAX, sock_port] ] [varlen] +synproxy_policy [ + CTA_SYNPROXY_ISN nlnetw[CTA_SYNPROXY_ISN, int32be] + CTA_SYNPROXY_ITS nlnetw[CTA_SYNPROXY_ITS, int32be] + CTA_SYNPROXY_TSOFF nlnetw[CTA_SYNPROXY_TSOFF, int32be] +] [varlen] + conntrack_proto = IPPROTO_UDP, IPPROTO_TCP, IPPROTO_ICMP, IPPROTO_DCCP, IPPROTO_SCTP, IPPROTO_UDPLITE, IPPROTO_GRE, IPPROTO_ICMPV6 ip_conntrack_status = IPS_SEEN_REPLY, IPS_ASSURED, IPS_FIXED_TIMEOUT, IPS_UNTRACKED, IPS_HELPER diff --git a/sys/linux/socket_netlink_netfilter_conntrack_386.const b/sys/linux/socket_netlink_netfilter_conntrack_386.const index 800fedc44..63c81fbc7 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack_386.const +++ b/sys/linux/socket_netlink_netfilter_conntrack_386.const @@ -41,6 +41,10 @@ CTA_SEQADJ_OFFSET_BEFORE = 2 CTA_SEQ_ADJ_ORIG = 15 CTA_SEQ_ADJ_REPLY = 16 CTA_STATUS = 3 +CTA_SYNPROXY = 24 +CTA_SYNPROXY_ISN = 1 +CTA_SYNPROXY_ITS = 2 +CTA_SYNPROXY_TSOFF = 3 CTA_TIMEOUT = 7 CTA_TUPLE_IP = 1 CTA_TUPLE_MASTER = 14 diff --git a/sys/linux/socket_netlink_netfilter_conntrack_amd64.const b/sys/linux/socket_netlink_netfilter_conntrack_amd64.const index 46299d088..f6b5d7212 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack_amd64.const +++ b/sys/linux/socket_netlink_netfilter_conntrack_amd64.const @@ -41,6 +41,10 @@ CTA_SEQADJ_OFFSET_BEFORE = 2 CTA_SEQ_ADJ_ORIG = 15 CTA_SEQ_ADJ_REPLY = 16 CTA_STATUS = 3 +CTA_SYNPROXY = 24 +CTA_SYNPROXY_ISN = 1 +CTA_SYNPROXY_ITS = 2 +CTA_SYNPROXY_TSOFF = 3 CTA_TIMEOUT = 7 CTA_TUPLE_IP = 1 CTA_TUPLE_MASTER = 14 diff --git a/sys/linux/socket_netlink_netfilter_conntrack_arm.const b/sys/linux/socket_netlink_netfilter_conntrack_arm.const index d2dcbc0a7..fb8e12ef2 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack_arm.const +++ b/sys/linux/socket_netlink_netfilter_conntrack_arm.const @@ -41,6 +41,10 @@ CTA_SEQADJ_OFFSET_BEFORE = 2 CTA_SEQ_ADJ_ORIG = 15 CTA_SEQ_ADJ_REPLY = 16 CTA_STATUS = 3 +CTA_SYNPROXY = 24 +CTA_SYNPROXY_ISN = 1 +CTA_SYNPROXY_ITS = 2 +CTA_SYNPROXY_TSOFF = 3 CTA_TIMEOUT = 7 CTA_TUPLE_IP = 1 CTA_TUPLE_MASTER = 14 diff --git a/sys/linux/socket_netlink_netfilter_conntrack_arm64.const b/sys/linux/socket_netlink_netfilter_conntrack_arm64.const index 195f97745..109b0168b 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack_arm64.const +++ b/sys/linux/socket_netlink_netfilter_conntrack_arm64.const @@ -41,6 +41,10 @@ CTA_SEQADJ_OFFSET_BEFORE = 2 CTA_SEQ_ADJ_ORIG = 15 CTA_SEQ_ADJ_REPLY = 16 CTA_STATUS = 3 +CTA_SYNPROXY = 24 +CTA_SYNPROXY_ISN = 1 +CTA_SYNPROXY_ITS = 2 +CTA_SYNPROXY_TSOFF = 3 CTA_TIMEOUT = 7 CTA_TUPLE_IP = 1 CTA_TUPLE_MASTER = 14 diff --git a/sys/linux/socket_netlink_netfilter_conntrack_mips64le.const b/sys/linux/socket_netlink_netfilter_conntrack_mips64le.const index 3bca93fef..242ea1898 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack_mips64le.const +++ b/sys/linux/socket_netlink_netfilter_conntrack_mips64le.const @@ -41,6 +41,10 @@ CTA_SEQADJ_OFFSET_BEFORE = 2 CTA_SEQ_ADJ_ORIG = 15 CTA_SEQ_ADJ_REPLY = 16 CTA_STATUS = 3 +CTA_SYNPROXY = 24 +CTA_SYNPROXY_ISN = 1 +CTA_SYNPROXY_ITS = 2 +CTA_SYNPROXY_TSOFF = 3 CTA_TIMEOUT = 7 CTA_TUPLE_IP = 1 CTA_TUPLE_MASTER = 14 diff --git a/sys/linux/socket_netlink_netfilter_conntrack_ppc64le.const b/sys/linux/socket_netlink_netfilter_conntrack_ppc64le.const index d603eb6ae..925f7b6f8 100644 --- a/sys/linux/socket_netlink_netfilter_conntrack_ppc64le.const +++ b/sys/linux/socket_netlink_netfilter_conntrack_ppc64le.const @@ -41,6 +41,10 @@ CTA_SEQADJ_OFFSET_BEFORE = 2 CTA_SEQ_ADJ_ORIG = 15 CTA_SEQ_ADJ_REPLY = 16 CTA_STATUS = 3 +CTA_SYNPROXY = 24 +CTA_SYNPROXY_ISN = 1 +CTA_SYNPROXY_ITS = 2 +CTA_SYNPROXY_TSOFF = 3 CTA_TIMEOUT = 7 CTA_TUPLE_IP = 1 CTA_TUPLE_MASTER = 14 diff --git a/sys/linux/socket_netlink_route_sched.txt b/sys/linux/socket_netlink_route_sched.txt index 2cef239c7..371e8c909 100644 --- a/sys/linux/socket_netlink_route_sched.txt +++ b/sys/linux/socket_netlink_route_sched.txt @@ -791,6 +791,7 @@ fl_policy [ TCA_FLOWER_KEY_CT_MARK_MASK nlattr[TCA_FLOWER_KEY_CT_MARK_MASK, int32] TCA_FLOWER_KEY_CT_LABELS nlattr[TCA_FLOWER_KEY_CT_LABELS, array[int8, 16]] TCA_FLOWER_KEY_CT_LABELS_MASK nlattr[TCA_FLOWER_KEY_CT_LABELS_MASK, array[int8, 16]] +# TODO: add TCA_FLOWER_KEY_MPLS_OPTS ] [varlen] enc_opts_policy [ |
