Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1439613

[PATCH net] udp: prevent bugcheck if filter truncates packet too much

Show all headers | View raw

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)) {
-- 
2.9.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net] udp: prevent bugcheck if filter truncates packet too much Michal Kubecek <mkubecek@suse.cz> - 2016-07-08 18:10 +0200
  Re: [PATCH net] udp: prevent bugcheck if filter truncates packet  too much Eric Dumazet <eric.dumazet@gmail.com> - 2016-07-09 01:40 +0200
    Re: [PATCH net] udp: prevent bugcheck if filter truncates packet too  much Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-07-09 02:30 +0200
      Re: [PATCH net] udp: prevent bugcheck if filter truncates packet  too much Daniel Borkmann <daniel@iogearbox.net> - 2016-07-09 11:50 +0200
        Re: [PATCH net] udp: prevent bugcheck if filter truncates packet too  much Michal Kubecek <mkubecek@suse.cz> - 2016-07-09 12:50 +0200
          Re: [PATCH net] udp: prevent bugcheck if filter truncates packet too much Willem de Bruijn <willemb@google.com> - 2016-07-09 15:10 +0200
  Re: [PATCH net] udp: prevent bugcheck if filter truncates packet  too much David Miller <davem@davemloft.net> - 2016-07-11 21:50 +0200

csiph-web