diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-29 23:41:43 +1100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-29 23:41:43 +1100 |
| commit | 17efdd45755c0eb8d1418a1368ef7c7ebbe98c6e (patch) | |
| tree | 9c35ed698428088f320ef80a222b4339acd4a188 /net/bridge | |
| parent | 0a11225887fe6cbccd882404dc36ddc50f47daf9 (diff) | |
| download | linux-17efdd45755c0eb8d1418a1368ef7c7ebbe98c6e.tar.gz linux-17efdd45755c0eb8d1418a1368ef7c7ebbe98c6e.tar.bz2 linux-17efdd45755c0eb8d1418a1368ef7c7ebbe98c6e.zip | |
[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@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index 93867bb6cc97..a90182873120 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; } |