Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6047108c443aa6dc359e205ad028e7533a605b43

Authored by Jason Wang
Committed by Greg Kroah-Hartman
1 parent e697716658

net: flow_dissector: fail on evil iph->ihl 

[ Upstream commit 6f092343855a71e03b8d209815d8c45bf3a27fcd ]

We don't validate iph->ihl which may lead a dead loop if we meet a IPIP
skb whose iph->ihl is zero. Fix this by failing immediately when iph->ihl
is evil (less than 5).

This issue were introduced by commit ec5efe7946280d1e84603389a1030ccec0a767ae
(rps: support IPIP encapsulation).

Signed-off-by: Jason Wang <jasowang@redhat.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Petr Matousek <pmatouse@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

net/core/flow_dissector.c
Diff comments   View file @ 6047108
... ... @@ -40,7 +40,7 @@
40 40 struct iphdr _iph;
41 41 ip:
42 42 iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
43   - if (!iph)
  43 + if (!iph || iph->ihl < 5)
44 44 return false;
45 45  
46 46 if (ip_is_fragment(iph))