[netfilter-cvslog] r4550 - in trunk/patch-o-matic-ng/patchlets/set: linux/net/ipv4/netfilter linux-2.6/net/ipv4/netfilter

[kadlec at netfilter.org]

Author: kadlec at netfilter.org
Date: 2005-11-24 10:04:19 +0100 (Thu, 24 Nov 2005)
New Revision: 4550

Modified:
   trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c
   trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipporthash.c
   trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c
   trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c
   trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipporthash.c
   trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c
Log:
Fixed checking for memory allocation failure in some set types.

Signed-off-by: Jones Desougi <jones at ingate.com>
Signed-off-by: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>



Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c	2005-11-22 22:22:28 UTC (rev 4549)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_iphash.c	2005-11-24 09:04:19 UTC (rev 4550)
@@ -171,7 +171,7 @@
 
 	tmp = kmalloc(sizeof(struct ip_set_iphash) 
 		      + map->probes * sizeof(uint32_t), GFP_ATOMIC);
-	if (!map) {
+	if (!tmp) {
 		DP("out of memory for %d bytes",
 		   sizeof(struct ip_set_iphash)
 		   + map->probes * sizeof(uint32_t));

Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipporthash.c	2005-11-22 22:22:28 UTC (rev 4549)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_ipporthash.c	2005-11-24 09:04:19 UTC (rev 4550)
@@ -270,7 +270,7 @@
 
 	tmp = kmalloc(sizeof(struct ip_set_ipporthash) 
 		      + map->probes * sizeof(uint32_t), GFP_ATOMIC);
-	if (!map) {
+	if (!tmp) {
 		DP("out of memory for %d bytes",
 		   sizeof(struct ip_set_ipporthash)
 		   + map->probes * sizeof(uint32_t));

Modified: trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c	2005-11-22 22:22:28 UTC (rev 4549)
+++ trunk/patch-o-matic-ng/patchlets/set/linux/net/ipv4/netfilter/ip_set_nethash.c	2005-11-24 09:04:19 UTC (rev 4550)
@@ -234,7 +234,7 @@
 
 	tmp = kmalloc(sizeof(struct ip_set_nethash) 
 		      + map->probes * sizeof(uint32_t), GFP_ATOMIC);
-	if (!map) {
+	if (!tmp) {
 		DP("out of memory for %d bytes",
 		   sizeof(struct ip_set_nethash)
 		   + map->probes * sizeof(uint32_t));

Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c	2005-11-22 22:22:28 UTC (rev 4549)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_iphash.c	2005-11-24 09:04:19 UTC (rev 4550)
@@ -170,7 +170,7 @@
 
 	tmp = kmalloc(sizeof(struct ip_set_iphash) 
 		      + map->probes * sizeof(uint32_t), GFP_ATOMIC);
-	if (!map) {
+	if (!tmp) {
 		DP("out of memory for %d bytes",
 		   sizeof(struct ip_set_iphash)
 		   + map->probes * sizeof(uint32_t));

Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipporthash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipporthash.c	2005-11-22 22:22:28 UTC (rev 4549)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_ipporthash.c	2005-11-24 09:04:19 UTC (rev 4550)
@@ -269,7 +269,7 @@
 
 	tmp = kmalloc(sizeof(struct ip_set_ipporthash) 
 		      + map->probes * sizeof(uint32_t), GFP_ATOMIC);
-	if (!map) {
+	if (!tmp) {
 		DP("out of memory for %d bytes",
 		   sizeof(struct ip_set_ipporthash)
 		   + map->probes * sizeof(uint32_t));

Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c	2005-11-22 22:22:28 UTC (rev 4549)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/net/ipv4/netfilter/ip_set_nethash.c	2005-11-24 09:04:19 UTC (rev 4550)
@@ -233,7 +233,7 @@
 
 	tmp = kmalloc(sizeof(struct ip_set_nethash) 
 		      + map->probes * sizeof(uint32_t), GFP_ATOMIC);
-	if (!map) {
+	if (!tmp) {
 		DP("out of memory for %d bytes",
 		   sizeof(struct ip_set_nethash)
 		   + map->probes * sizeof(uint32_t));