Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6127697 authored by Michal Kubeček's avatar Michal Kubeček Committed by David S. Miller
Browse files

udp: prevent bugcheck if filter truncates packet too much 

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: e6afc8ac ("udp: remove headers from UDP packets before queueing")
Reported-by: default avatarMarco Grassi <marco.gra@gmail.com>
Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3ea3119

net/ipv4/udp.c

+2 −0
Original line number Diff line number Diff line
@@ -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)) {

net/ipv6/udp.c

+2 −0
Original line number Diff line number Diff line
@@ -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)) {