[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <474C2C2E.7050001@openvz.org>
Date: Tue, 27 Nov 2007 17:39:42 +0300
From: Pavel Emelyanov <xemul@...nvz.org>
To: Herbert Xu <herbert@...dor.apana.org.au>,
Stephen Hemminger <shemminger@...ux-foundation.org>
CC: bridge@...ts.linux-foundation.org,
Linux Netdev List <netdev@...r.kernel.org>, devel@...nvz.org
Subject: [PATCH][BRIDGE] Lost call to br_fdb_fini() in br_init() error path
In case the br_netfilter_init() (or any subsequent call)
fails, the br_fdb_fini() must be called to free the allocated
in br_fdb_init() br_fdb_cache kmem cache.
Signed-off-by: Pavel Emelyanov <xemul@...nvz.org>
---
diff --git a/net/bridge/br.c b/net/bridge/br.c
index 93867bb..a901828 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -39,7 +39,7 @@ static int __init br_init(void)
err = br_fdb_init();
if (err)
- goto err_out1;
+ goto err_out;
err = br_netfilter_init();
if (err)
@@ -65,6 +65,8 @@ err_out3:
err_out2:
br_netfilter_fini();
err_out1:
+ br_fdb_fini();
+err_out:
llc_sap_put(br_stp_sap);
return err;
}
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists