iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flow_dissector: Check skb for VLAN only if skb specified.

Browse Source 
Fixes a panic when calling eth_get_headlen(). Noticed on i40e driver.

Fixes: d5709f7ab7 ("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>
This commit is contained in:
Eric Garver 2016-10-17 16:30:12 -04:00 committed by David S. Miller
parent b4f0fd4baa
commit 3805a938a6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/flow_dissector.c
View File

@ -247,12 +247,10 @@ ipv6:
case htons(ETH_P_8021Q): { case htons(ETH_P_8021Q): {
const struct vlan_hdr *vlan; const struct vlan_hdr *vlan;
if (skb_vlan_tag_present(skb)) if (skb && skb_vlan_tag_present(skb))
proto = skb->protocol; proto = skb->protocol;
if (!skb_vlan_tag_present(skb) || if (eth_type_vlan(proto)) {
proto == cpu_to_be16(ETH_P_8021Q) ||
proto == cpu_to_be16(ETH_P_8021AD)) {
struct vlan_hdr _vlan; struct vlan_hdr _vlan;
vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan), vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan),