netdev - Re: [PATCH net] qfq: don't leak skb if kzalloc fails

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]

Message-ID: <1465401273.7945.18.camel@edumazet-glaptop3.roam.corp.google.com>
Date:	Wed, 08 Jun 2016 08:54:33 -0700
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Florian Westphal <fw@...len.de>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH net] qfq: don't leak skb if kzalloc fails

On Wed, 2016-06-08 at 14:31 +0200, Florian Westphal wrote:
> When we need to create a new aggregate to enqueue the skb we need
> to kzalloc the new struct.
> 
> If that fails we returned ENOBUFS without freeing the skb.
> 
> Spotted during code review.
> 
> Signed-off-by: Florian Westphal <fw@...len.de>
> ---
>  net/sched/sch_qfq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
> index 8d2d8d9..435b970 100644
> --- a/net/sched/sch_qfq.c
> +++ b/net/sched/sch_qfq.c
> @@ -1236,7 +1236,7 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
>  		err = qfq_change_agg(sch, cl, cl->agg->class_weight,
>  				     qdisc_pkt_len(skb));
>  		if (err)
> -			return err;
> +			return qdisc_drop(skb, sch);
>  	}
>  
>  	err = qdisc_enqueue(skb, cl->qdisc);

Good catch, but it looks like you forgot :

	cl->qstats.drops++;