| commit | 77fe9fd0e5edf6299907e0e0b0b5cf702099bd5e | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sun Feb 02 21:47:47 2014 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sun Feb 02 21:47:47 2014 -0800 |
| tree | 83bf5cb49a6eb81661f29d7e32ab0f30143c836c | |
| parent | 5589fc262d06a93095d58aadfcf9598b66a30765 [diff] | |
| parent | 0e0d0ce90edb2a526b7c08ae5c6485d5376c6a63 [diff] |
Merge "net: flow_dissector: fail on evil iph->ihl"
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index a225089..f378b38 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c
@@ -35,7 +35,7 @@ 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))