Skip to content

Commit

Permalink
net: flow_dissector: fail on evil iph->ihl
Browse files Browse the repository at this point in the history
commit 6f09234 upstream.

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 ec5efe7
(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>
[bwh: Backported to 3.2: the affected code is in __skb_get_rxhash()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
Jason Wang authored and Ben Hutchings committed Jan 3, 2014
1 parent cc5285f commit f7d537d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2609,6 +2609,8 @@ void __skb_get_rxhash(struct sk_buff *skb)
goto done;

ip = (const struct iphdr *) (skb->data + nhoff);
if (ip->ihl < 5)
goto done;
if (ip_is_fragment(ip))
ip_proto = 0;
else
Expand Down

0 comments on commit f7d537d

Please sign in to comment.