linux-kernel - Re: [PATCH net] udp: prevent bugcheck if filter truncates packet too much

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: <20160709002016.GA27494@ast-mbp.thefacebook.com>
Date:	Fri, 8 Jul 2016 17:20:18 -0700
From:	Alexei Starovoitov <alexei.starovoitov@...il.com>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	Michal Kubecek <mkubecek@...e.cz>,
	Willem de Bruijn <willemb@...gle.com>,
	"David S. Miller" <davem@...emloft.net>,
	samanthakumar <samanthakumar@...gle.com>,
	Marco Grassi <marco.gra@...il.com>, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Alexey Kuznetsov <kuznet@....inr.ac.ru>,
	James Morris <jmorris@...ei.org>,
	Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
	Patrick McHardy <kaber@...sh.net>
Subject: Re: [PATCH net] udp: prevent bugcheck if filter truncates packet too
 much

On Sat, Jul 09, 2016 at 01:31:40AM +0200, Eric Dumazet wrote:
> On Fri, 2016-07-08 at 17:52 +0200, Michal Kubecek wrote:
> > If socket filter truncates an udp packet below the length of UDP header
> > in udpv6_queue_rcv_skb() or udp_queue_rcv_skb(), it will trigger a
> > BUG_ON in skb_pull_rcsum(). This BUG_ON (and therefore a system crash if
> > kernel is configured that way) can be easily enforced by an unprivileged
> > user which was reported as CVE-2016-6162. For a reproducer, see
> > http://seclists.org/oss-sec/2016/q3/8
> > 
> > Fixes: e6afc8ace6dd ("udp: remove headers from UDP packets before queueing")
> > Reported-by: Marco Grassi <marco.gra@...il.com>
> > Signed-off-by: Michal Kubecek <mkubecek@...e.cz>
> > ---
> >  net/ipv4/udp.c | 2 ++
> >  net/ipv6/udp.c | 2 ++
> >  2 files changed, 4 insertions(+)
> > 
> > diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
> > index ca5e8ea29538..4aed8fc23d32 100644
> > --- a/net/ipv4/udp.c
> > +++ b/net/ipv4/udp.c
> > @@ -1583,6 +1583,8 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
> >  
> >  	if (sk_filter(sk, skb))
> >  		goto drop;
> > +	if (unlikely(skb->len < sizeof(struct udphdr)))
> > +		goto drop;
> >  
> >  	udp_csum_pull_header(skb);
> >  	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
> > diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
> > index 005dc82c2138..acc09705618b 100644
> > --- a/net/ipv6/udp.c
> > +++ b/net/ipv6/udp.c
> > @@ -620,6 +620,8 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
> >  
> >  	if (sk_filter(sk, skb))
> >  		goto drop;
> > +	if (unlikely(skb->len < sizeof(struct udphdr)))
> > +		goto drop;
> >  
> >  	udp_csum_pull_header(skb);
> >  	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
> 
> 
> Arg :(
> 
> Acked-by: Eric Dumazet <edumazet@...gle.com>

this is incomplete fix. Please do not apply. See discussion at security@...nel