diff options
| author | Jaime Caamaño Ruiz <jcaamano@suse.com> | 2018-11-02 12:45:14 +0100 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-11-02 13:44:53 -0700 |
| commit | 9a98793c0932033b0a9b7616a2e95b3f3fd2a7d1 (patch) | |
| tree | d78fef8d9bbd0d5353bda113e1b4665e96c25b6f /datapath | |
| parent | 0fb02e8e50f61aca2eaed0e84de71d97a483cdf2 (diff) | |
| download | openvswitch-9a98793c0932033b0a9b7616a2e95b3f3fd2a7d1.tar.gz | |
datapath: Fix wrong push/pop ethernet validation
Upstream commit:
commit 46ebe2834ba5b541f28ee72e556a3fed42c47570
Author: Jaime Caamaño Ruiz <jcaamano@suse.com>
Date: Wed Oct 31 18:52:03 2018 +0100
openvswitch: Fix push/pop ethernet validation
When there are both pop and push ethernet header actions among the
actions to be applied to a packet, an unexpected EINVAL (Invalid
argument) error is obtained. This is due to mac_proto not being reset
correctly when those actions are validated.
Reported-at:
https://mail.openvswitch.org/pipermail/ovs-discuss/2018-October/047554.html
Fixes: 91820da6ae85 ("openvswitch: add Ethernet push and pop actions")
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>
Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-October/047554.html
Fixes: 6fcecb85ab ("datapath: add Ethernet push and pop actions")
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/flow_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index c3f1baa05..ee0c18422 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -2998,7 +2998,7 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr, * is already present */ if (mac_proto != MAC_PROTO_NONE) return -EINVAL; - mac_proto = MAC_PROTO_NONE; + mac_proto = MAC_PROTO_ETHERNET; break; case OVS_ACTION_ATTR_POP_ETH: @@ -3006,7 +3006,7 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr, return -EINVAL; if (vlan_tci & htons(VLAN_TAG_PRESENT)) return -EINVAL; - mac_proto = MAC_PROTO_ETHERNET; + mac_proto = MAC_PROTO_NONE; break; case OVS_ACTION_ATTR_PUSH_NSH: |