netdev - Re: [PATCH] tcp: handle tcp_net_metrics_init() order-5 memory allocation failures

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1353023752.24310.1.camel@joe-AO722>
Date:	Thu, 15 Nov 2012 15:55:52 -0800
From:	Joe Perches <joe@...ches.com>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	David Miller <davem@...emloft.net>,
	netdev <netdev@...r.kernel.org>, Julien Tinnes <jln@...gle.com>
Subject: Re: [PATCH] tcp: handle tcp_net_metrics_init() order-5 memory
 allocation failures

On Thu, 2012-11-15 at 15:41 -0800, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@...gle.com>
> 
> order-5 allocations can fail with current kernels, we should
> try to reduce allocation sizes to allow network namespace
> creation.
> 
> Reported-by: Julien Tinnes <jln@...gle.com>
> Signed-off-by: Eric Dumazet <edumazet@...gle.com>
> ---
>  net/ipv4/tcp_metrics.c |   13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
> index 53bc584..15e93c4 100644
> --- a/net/ipv4/tcp_metrics.c
> +++ b/net/ipv4/tcp_metrics.c
> @@ -1030,14 +1030,17 @@ static int __net_init tcp_net_metrics_init(struct net *net)
>  		else
>  			slots = 8 * 1024;
>  	}
> -
> +retry:
>  	net->ipv4.tcp_metrics_hash_log = order_base_2(slots);
>  	size = sizeof(struct tcpm_hash_bucket) << net->ipv4.tcp_metrics_hash_log;
>  
> -	net->ipv4.tcp_metrics_hash = kzalloc(size, GFP_KERNEL);
> -	if (!net->ipv4.tcp_metrics_hash)
> -		return -ENOMEM;
> -
> +	net->ipv4.tcp_metrics_hash = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
> +	if (!net->ipv4.tcp_metrics_hash) {
> +		if (slots <= 16)
> +			return -ENOMEM;

maybe readd the warning for OOM reporting here?

--
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