From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932889AbcGIAUf (ORCPT <rfc822;w@1wt.eu>);
	Fri, 8 Jul 2016 20:20:35 -0400
Received: from mail-pf0-f195.google.com ([209.85.192.195]:34624 "EHLO
	mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756290AbcGIAUX (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 8 Jul 2016 20:20:23 -0400
Date: Fri, 8 Jul 2016 17:20:18 -0700
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Michal Kubecek <mkubecek@suse.cz>, Willem de Bruijn <willemb@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        samanthakumar <samanthakumar@google.com>,
        Marco Grassi <marco.gra@gmail.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
        James Morris <jmorris@namei.org>,
        Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
        Patrick McHardy <kaber@trash.net>
Subject: Re: [PATCH net] udp: prevent bugcheck if filter truncates packet too
 much
Message-ID: <20160709002016.GA27494@ast-mbp.thefacebook.com>
References: <20160708155233.C78AAA0ECC@unicorn.suse.cz>
 <1468020700.30694.38.camel@edumazet-glaptop3.roam.corp.google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1468020700.30694.38.camel@edumazet-glaptop3.roam.corp.google.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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@gmail.com>
> > Signed-off-by: Michal Kubecek <mkubecek@suse.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@google.com>

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