diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2020-09-17 17:15:35 +0300 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-09-22 10:12:23 +0200 |
| commit | 2450c42f1be626b601353c1e039f8fcbadfaffb1 (patch) | |
| tree | 44f3d8c4e3f58be9845c8c7679e4f084dd2f5c4a /sys/linux | |
| parent | 85685b5d630bd5a08b951c0f091501544ece8982 (diff) | |
sys/linux: enhance ifreq_dev_t definition by setting attribute directions
This modification allows to remove [opt] modified for all uses of
ifreq_dev_t and ifreq_t
Diffstat (limited to 'sys/linux')
| -rw-r--r-- | sys/linux/socket.txt | 6 | ||||
| -rw-r--r-- | sys/linux/socket_can.txt | 2 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_generic_80211.txt | 2 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_generic_batadv.txt | 4 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_generic_team.txt | 2 | ||||
| -rw-r--r-- | sys/linux/socket_netlink_generic_wireguard.txt | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sys/linux/socket.txt b/sys/linux/socket.txt index 5bc654c74..dbda63c5d 100644 --- a/sys/linux/socket.txt +++ b/sys/linux/socket.txt @@ -284,7 +284,7 @@ ifreq_ioctls = SIOCGIFNAME, SIOCSIFLINK, SIOCGIFFLAGS, SIOCSIFFLAGS, SIOCGIFADDR ioctl$sock_ifreq(fd sock, cmd flags[ifreq_ioctls], arg ptr[inout, ifreq]) -ioctl$sock_SIOCGIFINDEX(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_t[ifindex[opt]]]) +ioctl$sock_SIOCGIFINDEX(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_t[ifindex]]) ioctl$sock_SIOCGIFBR(fd sock, cmd const[SIOCGIFBR], arg ptr[inout, brctl_arg]) ioctl$sock_SIOCSIFBR(fd sock, cmd const[SIOCSIFBR], arg ptr[inout, brctl_arg]) @@ -326,8 +326,8 @@ sendmmsg$sock(fd sock, mmsg ptr[in, array[mmsghdr_sock]], vlen len[mmsg], f flag resource ifindex[int32] type ifreq_dev_t[DEVNAME, ELEM] { - ifr_ifrn string[DEVNAME, IFNAMSIZ] - elem ELEM + ifr_ifrn string[DEVNAME, IFNAMSIZ] (in) + elem ELEM (out) } [size[IFREQ_SIZE]] type ifreq_t[ELEM] ifreq_dev_t[devnames, ELEM] diff --git a/sys/linux/socket_can.txt b/sys/linux/socket_can.txt index 8ee68998d..a7734f039 100644 --- a/sys/linux/socket_can.txt +++ b/sys/linux/socket_can.txt @@ -51,7 +51,7 @@ getsockopt$SO_J1939_PROMISC(fd sock_can_j1939, level const[SOL_CAN_J1939], opt c getsockopt$SO_J1939_ERRQUEUE(fd sock_can_j1939, level const[SOL_CAN_J1939], opt const[SO_J1939_ERRQUEUE], val ptr[out, int32], len ptr[inout, bytesize[val, int32]]) getsockopt$SO_J1939_SEND_PRIO(fd sock_can_j1939, level const[SOL_CAN_J1939], opt const[SO_J1939_SEND_PRIO], val ptr[out, int32], len ptr[inout, bytesize[val, int32]]) -ioctl$ifreq_SIOCGIFINDEX_vcan(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[vcan_device_names, ifindex_vcan[opt]]]) +ioctl$ifreq_SIOCGIFINDEX_vcan(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[vcan_device_names, ifindex_vcan]]) vcan_device_names = "vcan0", "vxcan0", "vxcan1" sockaddr_can { diff --git a/sys/linux/socket_netlink_generic_80211.txt b/sys/linux/socket_netlink_generic_80211.txt index d68117b2b..71d4fd175 100644 --- a/sys/linux/socket_netlink_generic_80211.txt +++ b/sys/linux/socket_netlink_generic_80211.txt @@ -20,7 +20,7 @@ type msghdr_nl80211[CMD, POLICY] msghdr_netlink[netlink_msg_t[nl80211_family_id, type nl80211_whipy int32[-1:4] syz_genetlink_get_family_id$nl80211(name ptr[in, string["nl80211"]]) nl80211_family_id -ioctl$sock_SIOCGIFINDEX_80211(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[nl80211_devnames, nl80211_ifindex[opt]]]) +ioctl$sock_SIOCGIFINDEX_80211(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[nl80211_devnames, nl80211_ifindex]]) sendmsg$NL80211_CMD_GET_WIPHY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_GET_WIPHY, nl80211_policy_dev]], f flags[send_flags]) sendmsg$NL80211_CMD_SET_WIPHY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211[NL80211_CMD_SET_WIPHY, nl80211_policy_wiphy]], f flags[send_flags]) diff --git a/sys/linux/socket_netlink_generic_batadv.txt b/sys/linux/socket_netlink_generic_batadv.txt index cefe3b08a..60fd39dea 100644 --- a/sys/linux/socket_netlink_generic_batadv.txt +++ b/sys/linux/socket_netlink_generic_batadv.txt @@ -33,8 +33,8 @@ sendmsg$BATADV_CMD_SET_VLAN(fd sock_nl_generic, msg ptr[in, msghdr_batadv[BATADV resource batadv_mesh_ifindex[ifindex] resource batadv_hard_ifindex[ifindex] -ioctl$ifreq_SIOCGIFINDEX_batadv_mesh(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t["batadv0", batadv_mesh_ifindex[opt]]]) -ioctl$ifreq_SIOCGIFINDEX_batadv_hard(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[batadv_hard_ifindex_names, batadv_hard_ifindex[opt]]]) +ioctl$ifreq_SIOCGIFINDEX_batadv_mesh(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t["batadv0", batadv_mesh_ifindex]]) +ioctl$ifreq_SIOCGIFINDEX_batadv_hard(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[batadv_hard_ifindex_names, batadv_hard_ifindex]]) batadv_hard_ifindex_names = "batadv_slave_0", "batadv_slave_1" diff --git a/sys/linux/socket_netlink_generic_team.txt b/sys/linux/socket_netlink_generic_team.txt index 226c873b4..a622b5380 100644 --- a/sys/linux/socket_netlink_generic_team.txt +++ b/sys/linux/socket_netlink_generic_team.txt @@ -14,7 +14,7 @@ resource ifindex_team[ifindex] type msghdr_nl_team[CMD] msghdr_netlink[netlink_msg_t[genl_team_family_id, genlmsghdr_t[CMD], team_nl_policy]] syz_genetlink_get_family_id$team(name ptr[in, string["team"]]) genl_team_family_id -ioctl$ifreq_SIOCGIFINDEX_team(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t["team0", ifindex_team[opt]]]) +ioctl$ifreq_SIOCGIFINDEX_team(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t["team0", ifindex_team]]) sendmsg$TEAM_CMD_NOOP(fd sock_nl_generic, msg ptr[in, msghdr_nl_team[TEAM_CMD_NOOP]], f flags[send_flags]) sendmsg$TEAM_CMD_OPTIONS_SET(fd sock_nl_generic, msg ptr[in, msghdr_nl_team[TEAM_CMD_OPTIONS_SET]], f flags[send_flags]) diff --git a/sys/linux/socket_netlink_generic_wireguard.txt b/sys/linux/socket_netlink_generic_wireguard.txt index 68a3f2826..ec13712c9 100644 --- a/sys/linux/socket_netlink_generic_wireguard.txt +++ b/sys/linux/socket_netlink_generic_wireguard.txt @@ -22,7 +22,7 @@ sendmsg$WG_CMD_SET_DEVICE(fd sock_nl_generic, msg ptr[in, msghdr_wireguard[WG_CM setsockopt$SO_BINDTODEVICE_wg(fd sock, level const[SOL_SOCKET], optname const[SO_BINDTODEVICE], optval ptr[in, string[wireguard_devname]], optlen len[optval]) -ioctl$ifreq_SIOCGIFINDEX_wireguard(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[wireguard_devname, wireguard_ifindex[opt]]]) +ioctl$ifreq_SIOCGIFINDEX_wireguard(fd sock, cmd const[SIOCGIFINDEX], arg ptr[inout, ifreq_dev_t[wireguard_devname, wireguard_ifindex]]) device_policy [ WGDEVICE_A_IFINDEX nlattr[WGDEVICE_A_IFINDEX, wireguard_ifindex] |
