Messages in this thread Patch in this message | | | Date | Wed, 12 Dec 2007 22:35:19 -0800 | From | Greg KH <> | Subject | [patch 29/36] BRIDGE: Lost call to br_fdb_fini() in br_init() error path |
| |
2.6.22-stable review patch. If anyone has any objections, please let us know.
------------------ From: Pavel Emelyanov <xemul@openvz.org>
[BRIDGE]: Lost call to br_fdb_fini() in br_init() error path
[ Upstream commit: 17efdd45755c0eb8d1418a1368ef7c7ebbe98c6e ] 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@openvz.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- net/bridge/br.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- 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; } --
| |