build.patch

   1 commit 21c9f79121abb70324efe9fc19ef0fb3685afb1a
   2 Author: Florent Fourcot <florent.fourcot@wifirst.fr>
   3 Date:   Tue Nov 27 17:15:56 2018 +0100
   4
   5     netfilter: ipset: fix ip_set_byindex function
   6
   7     New function added by "Introduction of new commands and protocol
   8     version 7" is not working, since we return skb2 to user
   9
  10     Signed-off-by: Victorien Molle <victorien.molle@wifirst.fr>
  11     Signed-off-by: Florent Fourcot <florent.fourcot@wifirst.fr>
  12     Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  13
  14 diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
  15 index c2e32ee..b93805c 100644
  16 --- a/kernel/net/netfilter/ipset/ip_set_core.c
  17 +++ b/kernel/net/netfilter/ipset/ip_set_core.c
  18 @@ -1976,7 +1976,7 @@ IPSET_CBFN(ip_set_byindex, struct net *net, struct sock *ctnl,
  19         if (!nlh2)
  20                 goto nlmsg_failure;
  21         if (nla_put_u8(skb2, IPSET_ATTR_PROTOCOL, protocol(attr)) ||
  22 -           nla_put_string(skb, IPSET_ATTR_SETNAME, set->name))
  23 +           nla_put_string(skb2, IPSET_ATTR_SETNAME, set->name))
  24                 goto nla_put_failure;
  25         nlmsg_end(skb2, nlh2);
  26
  27 --- ipset-7.0/configure.ac~     2018-10-27 18:09:10.000000000 +0200
  28 +++ ipset-7.0/configure.ac      2018-12-03 19:36:17.306201572 +0100
  29 @@ -499,7 +499,7 @@ fi
  30  AC_MSG_CHECKING([kernel source for struct net in struct nfnl_callback])
  31  if test -f $ksourcedir/include/linux/netfilter/nfnetlink.h && \
  32     $AWK '/^struct nfnl_callback /,/^}/' $ksourcedir/include/linux/netfilter/nfnetlink.h | \
  33 -   $GREP -q 'struct net'; then
  34 +   $GREP 'call)' | $GREP -q 'struct net'; then
  35         AC_MSG_RESULT(yes)
  36         AC_SUBST(HAVE_NET_IN_NFNL_CALLBACK_FN, define)
  37  else