diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
| commit | d13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch) | |
| tree | 2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /net/openvswitch/flow.c | |
| parent | x86, printk: Add missing KERN_CONT to NMI selftest (diff) | |
| parent | Linux 3.4 (diff) | |
| download | wireguard-linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.xz wireguard-linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip | |
Merge commit 'v3.4' into x86/urgent
Diffstat (limited to 'net/openvswitch/flow.c')
| -rw-r--r-- | net/openvswitch/flow.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 1252c3081ef1..2a11ec2383ee 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -183,7 +183,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; } |