[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20071204013647.GB28582@verge.net.au>
Date: Tue, 4 Dec 2007 10:36:48 +0900
From: Simon Horman <horms@...ge.net.au>
To: Pavel Emelyanov <xemul@...nvz.org>
Cc: Herbert Xu <herbert@...dor.apana.org.au>,
David Miller <davem@...emloft.net>,
Linux Netdev List <netdev@...r.kernel.org>, devel@...nvz.org,
Wensong Zhang <wensong@...ux-vs.org>,
Julian Anastasov <ja@....bg>
Subject: Re: [PATCH][IPVS] Don't leak sysctl tables if the scheduler registration fails
On Mon, Dec 03, 2007 at 01:04:53PM +0300, Pavel Emelyanov wrote:
> In case we load lblc or lblcr module we can leak some sysctl
> tables if the call to register_ip_vs_scheduler() fails.
This looks correct to me.
> I've looked at the register_ip_vs_scheduler() code and saw, that
> the only reason to fail is the name collision, so I think that
> with some 3rd party schedulers this becomes a relevant issue. No?
I guess so. Though presumably register_ip_vs_scheduler() could
have other modes of failure in the future.
> Signed-off-by: Pavel Emelyanov <xemul@...nvz.org>
Acked-by: Simon Horman <horms@...ge.net.au>
> ---
>
> diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
> index b843a11..ad89644 100644
> --- a/net/ipv4/ipvs/ip_vs_lblc.c
> +++ b/net/ipv4/ipvs/ip_vs_lblc.c
> @@ -580,9 +580,14 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler =
>
> static int __init ip_vs_lblc_init(void)
> {
> + int ret;
> +
> INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list);
> sysctl_header = register_sysctl_table(lblc_root_table);
> - return register_ip_vs_scheduler(&ip_vs_lblc_scheduler);
> + ret = register_ip_vs_scheduler(&ip_vs_lblc_scheduler);
> + if (ret)
> + unregister_sysctl_table(sysctl_header);
> + return ret;
> }
>
>
> diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
> index e5b323a..2a5ed85 100644
> --- a/net/ipv4/ipvs/ip_vs_lblcr.c
> +++ b/net/ipv4/ipvs/ip_vs_lblcr.c
> @@ -769,9 +769,14 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler =
>
> static int __init ip_vs_lblcr_init(void)
> {
> + int ret;
> +
> INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);
> sysctl_header = register_sysctl_table(lblcr_root_table);
> - return register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
> + ret = register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
> + if (ret)
> + unregister_sysctl_table(sysctl_header);
> + return ret;
> }
>
>
--
Horms
--
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