From 2700c38137fedf4ea34330d84109bb1d9df941cb Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Thu, 8 Aug 2019 22:42:01 +0800 Subject: [PATCH] Revert "flow_dissector: Fix vlan header offset in __skb_flow_dissect" hulk inclusion category: bugfix bugzilla: 16589 CVE: NA ------------------------------------------------- This reverts commit 703f67f815bc382034f72a0ac8b2e35fcd37688b. The patch has introduced a bug, revert it and use a new fix. --- net/core/flow_dissector.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index a03df47a1899..415b95f76b66 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -785,10 +785,6 @@ bool __skb_flow_dissect(const struct sk_buff *skb, skb && skb_vlan_tag_present(skb)) { proto = skb->protocol; } else { - if (dissector_vlan == FLOW_DISSECTOR_KEY_MAX && - nhoff > sizeof(*vlan)) - nhoff -= sizeof(*vlan); - vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan), data, hlen, &_vlan); if (!vlan) { -- GitLab