diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-10-06 10:59:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-07 05:03:05 -0700 |
| commit | ec0d043d05e6e3c0c2fac5de922c800c027c6386 (patch) | |
| tree | 2d0f9a53ee81f172ea53061e7b68a51dbe98f1d2 /net/openvswitch/actions.c | |
| parent | b8f2257069f179c7bdedc9501c1623070c4c37bb (diff) | |
| download | op-kernel-dev-ec0d043d05e6e3c0c2fac5de922c800c027c6386.zip op-kernel-dev-ec0d043d05e6e3c0c2fac5de922c800c027c6386.tar.gz | |
openvswitch: Ensure flow is valid before executing ct
The ct action uses parts of the flow key, so we need to ensure that it
is valid before executing that action.
Fixes: 7f8a436eaa2c "openvswitch: Add conntrack action"
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 4cb93f9..c6a39bf 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -1102,6 +1102,12 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb, break; case OVS_ACTION_ATTR_CT: + if (!is_flow_key_valid(key)) { + err = ovs_flow_key_update(skb, key); + if (err) + return err; + } + err = ovs_ct_execute(ovs_dp_get_net(dp), skb, key, nla_data(a)); |
