From d0668a0df3000ab5b3cc501ba66bf0ef7757accb Mon Sep 17 00:00:00 2001
From: Paul Chaignon <paul.chaignon@gmail.com>
Date: Sun, 19 Nov 2023 18:59:32 +0100
Subject: sys/linux: use nested flag definitions where sensible

All flags that are subset of other flags were identified with the
following Bash script [1]. Only a small set of flags identified by the
script were rewritten to use nested flag definitions, after manually
checking if it makes sense (based on syzkaller context and man pages).

For example, msgget_flags was rewritten as follows:

    -msgget_flags = IPC_CREAT, IPC_EXCL, S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IWGRP, S_IXGRP, S_IROTH, S_IWOTH, S_IXOTH
    +msgget_flags = IPC_CREAT, IPC_EXCL, open_mode

According to the msgget(2) man page:

    Upon creation, the least significant bits of the argument msgflg
    define the permissions of the message queue.  These permission bits
    have the same format and semantics as the permissions specified for
    the mode argument of open(2).

So it is correct to use open_mode directly in the definition of the
flags for msgget(2).

1 -

    #!/bin/bash

    regexp_flags="^(\w+)\s*=\s+([a-zA-Z\"][^=]*)$"

    is_subset() {
      local -n subset=$1
      local -n superset=$2
      for element in "${subset[@]}"; do
        if [[ ! " ${superset[@]} " =~ " $element " ]]; then
          return 1
        fi
      done
      return 0
    }

    declare -A parsed_lines

    while IFS= read -r line; do
      if [[ ! "$line" =~ $regexp_flags ]]; then
        continue
      fi
      list_name="${BASH_REMATCH[1]}"
      values="${BASH_REMATCH[2]}"
      IFS=',' read -r -a values_array <<< "$(echo "$values" | sed 's/ //g' | tr ',' '\n' | sort | tr '\n' ',')"

      # Skip flags with too few value.
      if [ "${#values_array[@]}" -lt 3 ]; then
        continue
      fi
      # Skip the syz0, syz1, etc. lists.
      if [ "${values_array[0]}" = "\"syz0\"" ]; then
        continue
      fi
      parsed_lines["${list_name}"]="${values_array[@]}"
    done

    for list_name in "${!parsed_lines[@]}"; do
      values_array=(${parsed_lines["$list_name"]})
      for other_list_name in "${!parsed_lines[@]}"; do
        other_values_array=(${parsed_lines["$other_list_name"]})
        if [ "$list_name" = "$other_list_name" ]; then
          continue
        fi

        if is_subset values_array other_values_array; then
          if [ "${#values_array[@]}" -eq "${#other_values_array[@]}" ]; then
            echo "$list_name EQUALS $other_list_name"
          else
            echo "$list_name is a SUBET of $other_list_name"
          fi
        fi
      done
    done

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
---
 sys/linux/socket_inet6.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/linux/socket_inet6.txt')

diff --git a/sys/linux/socket_inet6.txt b/sys/linux/socket_inet6.txt
index 5c5f5c136..e5cdacab4 100644
--- a/sys/linux/socket_inet6.txt
+++ b/sys/linux/socket_inet6.txt
@@ -39,7 +39,7 @@ getpeername$inet6(fd sock_in6, peer ptr[out, sockaddr_in6], peerlen ptr[inout, l
 
 inet6_option_types_int = IPV6_ADDRFORM, IPV6_2292PKTINFO, IPV6_2292HOPOPTS, IPV6_2292DSTOPTS, IPV6_2292RTHDR, IPV6_CHECKSUM, IPV6_2292HOPLIMIT, IPV6_NEXTHOP, IPV6_AUTHHDR, IPV6_FLOWINFO, IPV6_UNICAST_HOPS, IPV6_MULTICAST_IF, IPV6_MULTICAST_HOPS, IPV6_MULTICAST_LOOP, IPV6_ROUTER_ALERT, IPV6_MTU_DISCOVER, IPV6_MTU, IPV6_RECVERR, IPV6_V6ONLY, IPV6_FLOWINFO_SEND, IPV6_HDRINCL, IPV6_RECVPKTINFO, IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT, IPV6_RECVHOPOPTS, IPV6_RECVRTHDR, IPV6_RECVDSTOPTS, IPV6_RECVPATHMTU, IPV6_DONTFRAG, IPV6_RECVTCLASS, IPV6_TCLASS, IP6T_SO_ORIGINAL_DST, IPV6_AUTOFLOWLABEL, IPV6_ADDR_PREFERENCES, IPV6_MINHOPCOUNT, IPV6_RECVORIGDSTADDR, IPV6_TRANSPARENT, IPV6_UNICAST_IF, MRT6_INIT, MRT6_DONE, MRT6_DEL_MIF, MRT6_VERSION, MRT6_ASSERT, MRT6_PIM, MRT6_TABLE, IPV6_FREEBIND
 
-inet6_option_types_buf = IPV6_2292PKTOPTIONS, IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST, IPV6_FLOWLABEL_MGR, IPV6_IPSEC_POLICY, IPV6_XFRM_POLICY, MCAST_JOIN_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE, MCAST_LEAVE_GROUP, MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, MCAST_MSFILTER, IPV6_PKTINFO, IPV6_PATHMTU, IP6T_SO_GET_REVISION_MATCH, IP6T_SO_GET_REVISION_TARGET, MRT6_ADD_MIF, MRT6_ADD_MFC, MRT6_DEL_MFC, MRT6_ADD_MFC_PROXY, MRT6_DEL_MFC_PROXY
+inet6_option_types_buf = IPV6_2292PKTOPTIONS, IPV6_FLOWLABEL_MGR, IPV6_IPSEC_POLICY, IPV6_XFRM_POLICY, MCAST_JOIN_GROUP, MCAST_LEAVE_GROUP, MCAST_MSFILTER, IPV6_PKTINFO, IPV6_PATHMTU, IP6T_SO_GET_REVISION_MATCH, IP6T_SO_GET_REVISION_TARGET, MRT6_ADD_MIF, MRT6_ADD_MFC, MRT6_DEL_MFC, MRT6_ADD_MFC_PROXY, MRT6_DEL_MFC_PROXY, sockopt_opt_ipv6_mreq, sockopt_opt_group_source_req
 
 getsockopt$inet6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[in, int32], optlen len[optval])
-- 
cgit mrf-deployment