[PATCH][BRIDGE] Lost call to br_fdb_fini() in br_init() error path

Stephen Hemminger shemminger at linux-foundation.org
Tue Nov 27 08:19:56 PST 2007


On Tue, 27 Nov 2007 17:39:42 +0300
Pavel Emelyanov <xemul at openvz.org> wrote:

> 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 at openvz.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;
>  }

Good catch, thanks I hope you didn't find this in live system.

-- 
Stephen Hemminger <shemminger at linux-foundation.org>


More information about the Bridge mailing list