summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog12
3 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8078a0f..1bfd6e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
+ - Warn about loaded in ip_set modules at module installation
+ - Use IPSET_BIN in resize-and-list.sh and suppress echoing of loop
+ variable
+ - Manpage typo corrections (David Wittman)
+ - Fix grammar error in manpage (Neutron Soutmun)
+
6.25.1
- ipset manpage: refer to iptables-extensions
- Update userspace header file from the kernel tree
diff --git a/configure.ac b/configure.ac
index 5ea2e36..91567da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.25.1], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.26], [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 f8b25f7..a8a6a49 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,15 @@
+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)
+ - Optimize hash creation routine (originally from Sergey Popovich)
+ - Make sure element data size is a multiple of u32 (originally from Sergey
+ Popovich)
+ - Make NLEN compile time constant for hash types (originally from Sergey
+ Popovich)
+ - Simplify mtype_expire() for hash types (originally from Sergey Popovich)
+ - Count non-static extension memory into the set memory size for userspace
+ - net: sched: Simplify em_ipset_match (Eric W. Biederman)
+
6.25.1
- net/netfilter/ipset: work around gcc-4.4.4 initializer bug
(Andrew Morton)