summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog14
3 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bfd6e5..9d38db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+6.27
+ - Handle uint64_t alignment issue in ipset tool
+
6.26
- Out of bound access in hash:net* types fixed (reported by Dave Jones):
new tests added to the testsuite to verify the fix
diff --git a/configure.ac b/configure.ac
index 8829403..6627ee7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.26], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.27], [kadlec@blackhole.kfki.hu])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index a8a6a49..3b0016c 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,17 @@
+6.27
+ - Fix reported memory size for hash:* types
+ - Fix hash type expire: release empty hash bucket block
+ - Fix hash type expiration: incorrect index fixed
+ - Collapse same condition body to a single one
+ - Fix extension alignment
+ - Compatibility: include linux/export.h when needed
+ - Compatibility: make sure vmalloc.h is included for kvfree()
+ - Compatibility: Fix detecting 'struct net' in 'struct tcf_ematch'
+ - Compatibility: Protect definition of RCU_INIT_POINTER in compatibility
+ header file
+ - netfilter: ipset: Fix sleeping memory allocation in atomic context
+ (Nikolay Borisov)
+
6.26
- Out of bound access in hash:net* types fixed (reported by Dave Jones)
- Make struct htype per ipset family (originally from Sergey Popovich)