From: Jarno Rajahalme <jrajahalme@nicira.com>
Date: Sun, 16 Feb 2014 01:37:45 +0000 (-0800)
Subject: openvswitch: Read tcp flags only then the tranport header is present.
X-Git-Tag: firefly_0821_release~176^2~4262^2~5^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04382a3303c22b0c536fbd0c94c1f012f2b8ed60;p=firefly-linux-kernel-4.4.55.git

openvswitch: Read tcp flags only then the tranport header is present.

Only the first IP fragment can have a TCP header, check for this.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 16f4b46161d4..d71e60fa28cb 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -73,6 +73,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, struct sk_buff *skb)
 
 	if ((flow->key.eth.type == htons(ETH_P_IP) ||
 	     flow->key.eth.type == htons(ETH_P_IPV6)) &&
+	    flow->key.ip.frag != OVS_FRAG_TYPE_LATER &&
 	    flow->key.ip.proto == IPPROTO_TCP &&
 	    likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
 		tcp_flags = TCP_FLAGS_BE16(tcp_hdr(skb));