diff options
| author |   Davide Caratti <dcaratti@redhat.com> | 2021-02-12 16:12:25 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-02-12 17:03:51 -0800 |
| commit | d2126838050ccd1dadf310ffb78b2204f3b032b9 (patch) | |
| tree | 61659bf5587ef25f01130ec875a2a975b587ec3e /net/core/flow_dissector.c | |
| parent | appletalk: Fix skb allocation size in loopback case (diff) | |
| download | linux-dev-d2126838050ccd1dadf310ffb78b2204f3b032b9.tar.xz linux-dev-d2126838050ccd1dadf310ffb78b2204f3b032b9.zip | |
flow_dissector: fix TTL and TOS dissection on IPv4 fragments
the following command:
# tc filter add dev $h2 ingress protocol ip pref 1 handle 101 flower \
$tcflags dst_ip 192.0.2.2 ip_ttl 63 action drop
doesn't drop all IPv4 packets that match the configured TTL / destination
address. In particular, if "fragment offset" or "more fragments" have non
zero value in the IPv4 header, setting of FLOW_DISSECTOR_KEY_IP is simply
ignored. Fix this dissecting IPv4 TTL and TOS before fragment info; while
at it, add a selftest for tc flower's match on 'ip_ttl' that verifies the
correct behavior.
Fixes: 518d8a2e9bad ("net/flow_dissector: add support for dissection of misc ip header fields")
Reported-by: Shuang Li <shuali@redhat.com>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/flow_dissector.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 6f1adba6695f..0b4f536bc32d 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -1050,6 +1050,9 @@ proto_again: key_control->addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS; } + __skb_flow_dissect_ipv4(skb, flow_dissector, + target_container, data, iph); + if (ip_is_fragment(iph)) { key_control->flags |= FLOW_DIS_IS_FRAGMENT; @@ -1066,9 +1069,6 @@ proto_again: } } - __skb_flow_dissect_ipv4(skb, flow_dissector, - target_container, data, iph); - break; } case htons(ETH_P_IPV6): { |