netdev - Re: [PATCH] netem: dont call vfree() under spinlock and BH disabled

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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Sat, 24 Dec 2011 11:18:54 -0800
From:	Stephen Hemminger <shemminger@...tta.com>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	David Miller <davem@...emloft.net>, netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH] netem: dont call vfree() under spinlock and BH disabled

On Sat, 24 Dec 2011 06:28:51 +0100
Eric Dumazet <eric.dumazet@...il.com> wrote:

> commit 6373a9a286 (netem: use vmalloc for distribution table) added a
> regression, since vfree() is called while holding a spinlock and BH
> being disabled.
> 
> Fix this by doing the pointers swap in critical section, and freeing
> after spinlock release.
> 
> Also add __GFP_NOWARN to the kmalloc() try, since we fallback to
> vmalloc().
> 
> Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
> ---
>  net/sched/sch_netem.c |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
> index eb3b9a8..a4ab207 100644
> --- a/net/sched/sch_netem.c
> +++ b/net/sched/sch_netem.c
> @@ -488,7 +488,7 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr)
>  		return -EINVAL;
>  
>  	s = sizeof(struct disttable) + n * sizeof(s16);
> -	d = kmalloc(s, GFP_KERNEL);
> +	d = kmalloc(s, GFP_KERNEL | __GFP_NOWARN);
>  	if (!d)
>  		d = vmalloc(s);
>  	if (!d)
> @@ -501,9 +501,10 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr)
>  	root_lock = qdisc_root_sleeping_lock(sch);
>  
>  	spin_lock_bh(root_lock);
> -	dist_free(q->delay_dist);
> -	q->delay_dist = d;
> +	swap(q->delay_dist, d);
>  	spin_unlock_bh(root_lock);
> +
> +	dist_free(d);
>  	return 0;
>  }

Acked-by: Stephen Hemminger <shemminger@...tta.com>
--
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