[netfilter-cvslog] r3968 - trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-10 11:00:05 +0200 (Fri, 10 Jun 2005)
New Revision: 3968

Modified:
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c
Log:
use ip_conntrack_expect_free() instead of kfree() on slab-allocated expects


Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-06-10 08:49:14 UTC (rev 3967)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_pptp.c	2005-06-10 09:00:05 UTC (rev 3968)
@@ -35,6 +35,9 @@
  * 	2004-10-22 - Version 2.0
  * 	  - merge Mandrake's 2.6.x port with recent 2.6.x API changes
  * 	  - fix lots of linear skb assumptions from Mandrake's port
+ * 	2005-06-10 - Version 2.1
+ * 	  - use ip_conntrack_expect_free() instead of kfree() on the
+ * 	    expect's (which are from the slab for quite some time)
  *
  */
 
@@ -50,7 +53,7 @@
 #include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h>
 #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
 
-#define IP_CT_PPTP_VERSION "2.0"
+#define IP_CT_PPTP_VERSION "2.1"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge at gnumonks.org>");
@@ -221,20 +224,20 @@
 	
 		/* Add GRE keymap entries */
 		if (ip_ct_gre_keymap_add(exp, &exp->tuple, 0) != 0) {
-			kfree(exp);
+			ip_conntrack_expect_free(exp);
 			return 1;
 		}
 
 		invert_tuplepr(&inv_tuple, &exp->tuple);
 		if (ip_ct_gre_keymap_add(exp, &inv_tuple, 1) != 0) {
 			ip_ct_gre_keymap_destroy(exp);
-			kfree(exp);
+			ip_conntrack_expect_free(exp);
 			return 1;
 		}
 	
 		if (ip_conntrack_expect_related(exp, master) != 0) {
 			ip_ct_gre_keymap_destroy(exp);
-			kfree(exp);
+			ip_conntrack_expect_free(exp);
 			DEBUGP("cannot expect_related()\n");
 			return 1;
 		}