From: Ben Pfaff Date: Sun, 2 Mar 2014 01:15:00 +0000 (-0800) Subject: tunnel: Do not set padding bits in tunnel mask. X-Git-Tag: sliver-openvswitch-2.2.90-1~9^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=87972a8fcd0f339c7229a014edd4c75fd9c1356c;p=sliver-openvswitch.git tunnel: Do not set padding bits in tunnel mask. On most architectures other than 32-bit x86, struct flow_tnl ends with 4 padding bytes. Until now, tnl_xlate_init() set those bytes to nonzero values in the wildcard mask. When the wildcard mask passed through Netlink attributes and back to userspace, the padding bytes of course became zero again, which caused a wildcard mask mismatch and premature deletion of the flow in revalidation. This commit fixes the problem. Bug #1192516. Reported-by: Krishna Miriyala Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index 38b782f6c..001045a53 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -324,10 +324,15 @@ tnl_xlate_init(const struct flow *base_flow, struct flow *flow, struct flow_wildcards *wc) { if (tnl_port_should_receive(flow)) { - memset(&wc->masks.tunnel, 0xff, sizeof wc->masks.tunnel); + wc->masks.tunnel.tun_id = OVS_BE64_MAX; + wc->masks.tunnel.ip_src = OVS_BE32_MAX; + wc->masks.tunnel.ip_dst = OVS_BE32_MAX; wc->masks.tunnel.flags = (FLOW_TNL_F_DONT_FRAGMENT | FLOW_TNL_F_CSUM | FLOW_TNL_F_KEY); + wc->masks.tunnel.ip_tos = UINT8_MAX; + wc->masks.tunnel.ip_ttl = UINT8_MAX; + memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark); if (!tnl_ecn_ok(base_flow, flow)) {