Commit b8678358 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: flow_dissector: fix thoff for IPPROTO_AH

In commit 8ed78166 ("flow_keys: include thoff into flow_keys for
later usage"), we missed that existing code was using nhoff as a
temporary variable that could not always contain transport header
offset.

This is not a problem for TCP/UDP because port offset (@poff)
is 0 for these protocols.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Daniel Borkmann <dborkman@redhat.com>
Cc: Nikolay Aleksandrov <nikolay@redhat.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Acked-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8386040b
...@@ -154,8 +154,8 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) ...@@ -154,8 +154,8 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
if (poff >= 0) { if (poff >= 0) {
__be32 *ports, _ports; __be32 *ports, _ports;
nhoff += poff; ports = skb_header_pointer(skb, nhoff + poff,
ports = skb_header_pointer(skb, nhoff, sizeof(_ports), &_ports); sizeof(_ports), &_ports);
if (ports) if (ports)
flow->ports = *ports; flow->ports = *ports;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment