aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author배석진 <soukjin.bae@samsung.com>2018-11-09 16:53:06 -0800
committerDavid S. Miller <davem@davemloft.net>2018-11-09 20:01:21 -0800
commit62230715fd2453b3ba948c9d83cfb3ada9169169 (patch)
tree661b09b8456959419d4be214b59a2772804ec7e0
parentnet: qualcomm: rmnet: Fix incorrect assignment of real_dev (diff)
downloadlinux-dev-62230715fd2453b3ba948c9d83cfb3ada9169169.tar.xz
linux-dev-62230715fd2453b3ba948c9d83cfb3ada9169169.zip
flow_dissector: do not dissect l4 ports for fragments
Only first fragment has the sport/dport information, not the following ones. If we want consistent hash for all fragments, we need to ignore ports even for first fragment. This bug is visible for IPv6 traffic, if incoming fragments do not have a flow label, since skb_get_hash() will give different results for first fragment and following ones. It is also visible if any routing rule wants dissection and sport or dport. See commit 5e5d6fed3741 ("ipv6: route: dissect flow in input path if fib rules need it") for details. [edumazet] rewrote the changelog completely. Fixes: 06635a35d13d ("flow_dissect: use programable dissector in skb_flow_dissect and friends") Signed-off-by: 배석진 <soukjin.bae@samsung.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/flow_dissector.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 676f3ad629f9..588f475019d4 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -1166,8 +1166,8 @@ ip_proto_again:
break;
}
- if (dissector_uses_key(flow_dissector,
- FLOW_DISSECTOR_KEY_PORTS)) {
+ if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS) &&
+ !(key_control->flags & FLOW_DIS_IS_FRAGMENT)) {
key_ports = skb_flow_dissector_target(flow_dissector,
FLOW_DISSECTOR_KEY_PORTS,
target_container);