netfilter-2.6/iptables/trunk/libiptc: libip4tc.c libip6tc.c

[pluto]

Author: pluto
Date: Sun Jun 26 11:10:41 2005
New Revision: 6182

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


Modified: netfilter-2.6/iptables/trunk/libiptc/libip4tc.c
==============================================================================
--- netfilter-2.6/iptables/trunk/libiptc/libip4tc.c	(original)
+++ netfilter-2.6/iptables/trunk/libiptc/libip4tc.c	Sun Jun 26 11:10:41 2005
@@ -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: netfilter-2.6/iptables/trunk/libiptc/libip6tc.c
==============================================================================
--- netfilter-2.6/iptables/trunk/libiptc/libip6tc.c	(original)
+++ netfilter-2.6/iptables/trunk/libiptc/libip6tc.c	Sun Jun 26 11:10:41 2005
@@ -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;
 }