linux-4.12.patch

   1 --- ipset-6.32/kernel/net/netfilter/ipset/ip_set_core.c.orig    2017-08-01 15:16:35.420874095 +0200
   2 +++ ipset-6.32/kernel/net/netfilter/ipset/ip_set_core.c 2017-08-01 15:20:22.597111757 +0200
   3 @@ -300,7 +300,11 @@
   4
   5         if (unlikely(!flag_nested(nla)))
   6                 return -IPSET_ERR_PROTOCOL;
   7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
   8 +       if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy, NULL))
   9 +#else
  10         if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy))
  11 +#endif
  12                 return -IPSET_ERR_PROTOCOL;
  13         if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV4)))
  14                 return -IPSET_ERR_PROTOCOL;
  15 @@ -318,7 +322,11 @@
  16         if (unlikely(!flag_nested(nla)))
  17                 return -IPSET_ERR_PROTOCOL;
  18
  19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  20 +       if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy, NULL))
  21 +#else
  22         if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy))
  23 +#endif
  24                 return -IPSET_ERR_PROTOCOL;
  25         if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV6)))
  26                 return -IPSET_ERR_PROTOCOL;
  27 @@ -914,7 +922,11 @@
  28         /* Without holding any locks, create private part. */
  29         if (attr[IPSET_ATTR_DATA] &&
  30             nla_parse_nested(tb, IPSET_ATTR_CREATE_MAX, attr[IPSET_ATTR_DATA],
  31 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  32 +                            set->type->create_policy, NULL)) {
  33 +#else
  34                              set->type->create_policy)) {
  35 +#endif
  36                 ret = -IPSET_ERR_PROTOCOL;
  37                 goto put_out;
  38         }
  39 @@ -1270,7 +1282,11 @@
  40
  41         /* Second pass, so parser can't fail */
  42         nla_parse(cda, IPSET_ATTR_CMD_MAX,
  43 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  44 +                 attr, nlh->nlmsg_len - min_len, ip_set_setname_policy, NULL);
  45 +#else
  46                   attr, nlh->nlmsg_len - min_len, ip_set_setname_policy);
  47 +#endif
  48
  49         if (cda[IPSET_ATTR_SETNAME]) {
  50                 struct ip_set *set;
  51 @@ -1333,7 +1333,11 @@
  52                          * manually :-(
  53                          */
  54                         if (nlh->nlmsg_flags & NLM_F_ACK)
  55 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  56 +                               netlink_ack(cb->skb, nlh, ret, NULL);
  57 +#else
  58                                 netlink_ack(cb->skb, nlh, ret);
  59 +#endif
  60                         return ret;
  61                 }
  62         }
  63 @@ -1526,7 +1542,11 @@
  64
  65                 nla_parse(cda, IPSET_ATTR_CMD_MAX,
  66                           cmdattr, nlh->nlmsg_len - min_len,
  67 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  68 +                         ip_set_adt_policy, NULL);
  69 +#else
  70                           ip_set_adt_policy);
  71 +#endif
  72
  73                 errline = nla_data(cda[IPSET_ATTR_LINENO]);
  74
  75 @@ -1573,7 +1593,11 @@
  76         if (attr[IPSET_ATTR_DATA]) {
  77                 if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX,
  78                                      attr[IPSET_ATTR_DATA],
  79 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  80 +                                    set->type->adt_policy, NULL))
  81 +#else
  82                                      set->type->adt_policy))
  83 +#endif
  84                         return -IPSET_ERR_PROTOCOL;
  85                 ret = call_ad(ctnl, skb, set, tb, IPSET_ADD, flags,
  86                               use_lineno);
  87 @@ -1585,7 +1609,11 @@
  88                         if (nla_type(nla) != IPSET_ATTR_DATA ||
  89                             !flag_nested(nla) ||
  90                             nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, nla,
  91 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
  92 +                                            set->type->adt_policy, NULL))
  93 +#else
  94                                              set->type->adt_policy))
  95 +#endif
  96                                 return -IPSET_ERR_PROTOCOL;
  97                         ret = call_ad(ctnl, skb, set, tb, IPSET_ADD,
  98                                       flags, use_lineno);
  99 @@ -1628,7 +1656,11 @@
 100         if (attr[IPSET_ATTR_DATA]) {
 101                 if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX,
 102                                      attr[IPSET_ATTR_DATA],
 103 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
 104 +                                    set->type->adt_policy, NULL))
 105 +#else
 106                                      set->type->adt_policy))
 107 +#endif
 108                         return -IPSET_ERR_PROTOCOL;
 109                 ret = call_ad(ctnl, skb, set, tb, IPSET_DEL, flags,
 110                               use_lineno);
 111 @@ -1640,7 +1672,11 @@
 112                         if (nla_type(nla) != IPSET_ATTR_DATA ||
 113                             !flag_nested(nla) ||
 114                             nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, nla,
 115 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
 116 +                                            set->type->adt_policy, NULL))
 117 +#else
 118                                              set->type->adt_policy))
 119 +#endif
 120                                 return -IPSET_ERR_PROTOCOL;
 121                         ret = call_ad(ctnl, skb, set, tb, IPSET_DEL,
 122                                       flags, use_lineno);
 123 @@ -1673,7 +1709,11 @@
 124                 return -ENOENT;
 125
 126         if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA],
 127 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
 128 +                            set->type->adt_policy, NULL))
 129 +#else
 130                              set->type->adt_policy))
 131 +#endif
 132                 return -IPSET_ERR_PROTOCOL;
 133
 134         rcu_read_lock_bh();