summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2013-08-14 15:50:36 -0700
committerJesse Gross <jesse@nicira.com>2013-08-14 15:50:36 -0700
commit36bf5cc66d60868bcc10aff209defed5a7b71c1d (patch)
tree1754ed6ef77bf8cb67f653339ca8a7705307b760
parent42415c90ceaf50c792e29823e359463bc6d4ee05 (diff)
downloadlinux-36bf5cc66d60868bcc10aff209defed5a7b71c1d.tar.gz
openvswitch: Reset tunnel key between input and output.
It doesn't make sense to output a tunnel packet using the same parameters that it was received with since that will generally just result in the packet going back to us. As a result, userspace assumes that the tunnel key is cleared when transitioning through the switch. In the majority of cases this doesn't matter since a packet is either going to a tunnel port (in which the key is overwritten with new values) or to a non-tunnel port (in which case the key is ignored). However, it's theoreticaly possible that userspace could rely on the documented behavior, so this corrects it. Signed-off-by: Jesse Gross <jesse@nicira.com>
-rw-r--r--net/openvswitch/actions.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 22c5f399f1cf..ab101f715447 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -535,6 +535,7 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb)
{
struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
+ OVS_CB(skb)->tun_key = NULL;
return do_execute_actions(dp, skb, acts->actions,
acts->actions_len, false);
}