[netfilter-cvslog] r3989 - trunk/iptables/libiptc

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-23 10:51:18 +0200 (Thu, 23 Jun 2005)
New Revision: 3989

Modified:
   trunk/iptables/libiptc/libip4tc.c
   trunk/iptables/libiptc/libip6tc.c
Log:
fix deletion of targets where kernel size != userspace size (Pablo Neira)


Modified: trunk/iptables/libiptc/libip4tc.c
===================================================================
--- trunk/iptables/libiptc/libip4tc.c	2005-06-22 12:25:54 UTC (rev 3988)
+++ trunk/iptables/libiptc/libip4tc.c	2005-06-23 08:51:18 UTC (rev 3989)
@@ -210,6 +210,7 @@
 	mptr = matchmask + sizeof(STRUCT_ENTRY);
 	if (IPT_MATCH_ITERATE(a, match_different, a->elems, b->elems, &mptr))
 		return NULL;
+	mptr += IPT_ALIGN(sizeof(struct ipt_entry_target));
 
 	return mptr;
 }

Modified: trunk/iptables/libiptc/libip6tc.c
===================================================================
--- trunk/iptables/libiptc/libip6tc.c	2005-06-22 12:25:54 UTC (rev 3988)
+++ trunk/iptables/libiptc/libip6tc.c	2005-06-23 08:51:18 UTC (rev 3989)
@@ -242,6 +242,7 @@
 	mptr = matchmask + sizeof(STRUCT_ENTRY);
 	if (IP6T_MATCH_ITERATE(a, match_different, a->elems, b->elems, &mptr))
 		return NULL;
+	mptr += IP6T_ALIGN(sizeof(struct ip6t_entry_target));
 
 	return mptr;
 }