From: green <green>
Date: Sat, 25 Oct 2003 08:17:27 +0000 (+0000)
Subject: Fix memory not being freed correctly and incorrect checks aroun memory
X-Git-Tag: v1_7_0_51~2^7~342
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=66e392490bbd73b4195676e4e8c8f9a1385e3ae8;p=fs%2Flustre-release.git

Fix memory not being freed correctly and incorrect checks aroun memory
allocations.
---

diff --git a/lnet/router/router.c b/lnet/router/router.c
index f082415..b5bab2c 100644
--- a/lnet/router/router.c
+++ b/lnet/router/router.c
@@ -580,8 +580,10 @@ kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid,
         atomic_set (&ge->kpge_weight, 0);
 
         PORTAL_ALLOC (re, sizeof (*re));
-        if (re == NULL)
+        if (re == NULL) {
+                PORTAL_FREE (ge, sizeof (*ge));
                 return (-ENOMEM);
+        }
 
         re->kpre_lo_nid = lo_nid;
         re->kpre_hi_nid = hi_nid;
diff --git a/lustre/portals/router/router.c b/lustre/portals/router/router.c
index f082415..b5bab2c 100644
--- a/lustre/portals/router/router.c
+++ b/lustre/portals/router/router.c
@@ -580,8 +580,10 @@ kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid,
         atomic_set (&ge->kpge_weight, 0);
 
         PORTAL_ALLOC (re, sizeof (*re));
-        if (re == NULL)
+        if (re == NULL) {
+                PORTAL_FREE (ge, sizeof (*ge));
                 return (-ENOMEM);
+        }
 
         re->kpre_lo_nid = lo_nid;
         re->kpre_hi_nid = hi_nid;