diff options
| -rw-r--r-- | datapath/flow.c | 3 | ||||
| -rw-r--r-- | lib/dpif-netdev.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/datapath/flow.c b/datapath/flow.c index c6f591af..06df0f66 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -239,7 +239,8 @@ void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb) u8 tcp_flags = 0; if (flow->key.eth.type == htons(ETH_P_IP) && - flow->key.ip.proto == IPPROTO_TCP) { + flow->key.ip.proto == IPPROTO_TCP && + likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) { u8 *tcp = (u8 *)tcp_hdr(skb); tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK; } diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 67b51896..0f93f969 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -987,7 +987,8 @@ dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key, flow->used = time_msec(); flow->packet_count++; flow->byte_count += packet->size; - if (key->dl_type == htons(ETH_TYPE_IP) && key->nw_proto == IPPROTO_TCP) { + if (key->dl_type == htons(ETH_TYPE_IP) && + key->nw_proto == IPPROTO_TCP && packet->l7) { struct tcp_header *th = packet->l4; flow->tcp_ctl |= th->tcp_ctl; } |