From b48328cdef146ce2a404df6c1125f54eeec44042 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 9 Jan 2020 20:28:32 +0100 Subject: ipset 7.5 released Signed-off-by: Jozsef Kadlecsik --- ChangeLog | 10 ++++++++++ configure.ac | 2 +- kernel/ChangeLog | 11 +++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 60d6acc..9a4bbf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +7.5 + - configure.ac: Support building with old autoconf 2.63 + (Serhey Popovych) + - configure.ac: Build on kernels without skb->vlan_proto correctly + (Serhey Popovych) + - configure.ac: Add cond_resched_rcu() checks (Serhey Popovych) + - configure.ac: Better match for ipv6_skip_exthdr() frag_offp + arg presence (Serhey Popovych) + - Document explicitly that protocol is not stored in bitmap:port + 7.4 - Fix compatibility support for netlink extended ACK and add synchronize_rcu_bh() checking diff --git a/configure.ac b/configure.ac index e3ddcce..a2694bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Boilerplate -AC_INIT([ipset], [7.4], [kadlec@netfilter.org]) +AC_INIT([ipset], [7.5], [kadlec@netfilter.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/kernel/ChangeLog b/kernel/ChangeLog index 79e736e..ec1eca5 100644 --- a/kernel/ChangeLog +++ b/kernel/ChangeLog @@ -1,3 +1,14 @@ +7.5 + - netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is present + (Florian Westphal) + - ip_set: Pass init_net when @net is missing in match check params + data structure (Serhey Popovych) + - netfilter: xt_set: Do not restrict --map-set to the mangle table + (Serhey Popovych) + - compat: em_ipset: Build on old kernels (Serhey Popovych) + - compat: Use skb_vlan_tag_present() instead of vlan_tx_tag_present() + (Serhey Popovych) + 7.4 - Fix nla_policies to fully support NL_VALIDATE_STRICT - treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 -- cgit v1.2.3