diff options
| author | Jason Wang <jasowang@redhat.com> | 2013-11-01 15:01:10 +0800 |
|---|---|---|
| committer | Doug Zobel <dzobel1@motorola.com> | 2014-08-12 12:53:45 -0500 |
| commit | 3b186c0431293d4417449a540cbaf2ef11d52003 (patch) | |
| tree | b8886cbc5196d72b75978e077f10ff973a820d07 | |
| parent | 4387752eb3b2e01b75e60e17261e7e7b34909122 (diff) | |
| download | olio-linux-3.10-3b186c0431293d4417449a540cbaf2ef11d52003.tar.xz olio-linux-3.10-3b186c0431293d4417449a540cbaf2ef11d52003.zip | |
net: flow_dissector: fail on evil iph->ihl
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).
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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/flow_dissector.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 00ee068efc1..578efb492b5 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -40,7 +40,7 @@ again: struct iphdr _iph; ip: iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph); - if (!iph) + if (!iph || iph->ihl < 5) return false; if (ip_is_fragment(iph)) |