diff options
| author | Eric Garver <e@erig.me> | 2016-10-17 16:30:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-19 10:35:46 -0400 |
| commit | 3805a938a6c24284863732fd45cec5a04609a224 (patch) | |
| tree | 3bfabe7aa9cd46d2bc4cda2ceb532981558908f1 /net/core | |
| parent | b4f0fd4baa90ecce798e0d26d1cce8f4457f2028 (diff) | |
| download | blackbird-op-linux-3805a938a6c24284863732fd45cec5a04609a224.tar.gz blackbird-op-linux-3805a938a6c24284863732fd45cec5a04609a224.zip | |
flow_dissector: Check skb for VLAN only if skb specified.
Fixes a panic when calling eth_get_headlen(). Noticed on i40e driver.
Fixes: d5709f7ab776 ("flow_dissector: For stripped vlan, get vlan info from skb->vlan_tci")
Signed-off-by: Eric Garver <e@erig.me>
Reviewed-by: Jakub Sitnicki <jkbs@redhat.com>
Acked-by: Amir Vadai <amir@vadai.me>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/flow_dissector.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 1a7b80f73376..44e6ba9d3a6b 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -247,12 +247,10 @@ ipv6: case htons(ETH_P_8021Q): { const struct vlan_hdr *vlan; - if (skb_vlan_tag_present(skb)) + if (skb && skb_vlan_tag_present(skb)) proto = skb->protocol; - if (!skb_vlan_tag_present(skb) || - proto == cpu_to_be16(ETH_P_8021Q) || - proto == cpu_to_be16(ETH_P_8021AD)) { + if (eth_type_vlan(proto)) { struct vlan_hdr _vlan; vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan), |
