* [PATCH net] openvswitch: Fix push/pop ethernet validation
@ 2018-10-31 17:52 Jaime Caamaño Ruiz
2018-10-31 20:13 ` Gregory Rose
2018-11-01 1:38 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Jaime Caamaño Ruiz @ 2018-10-31 17:52 UTC (permalink / raw)
To: netdev; +Cc: pshelar, Jaime Caamaño Ruiz
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>
---
net/openvswitch/flow_netlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index a70097ecf33c..865ecef68196 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -3030,7 +3030,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:
@@ -3038,7 +3038,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:
--
2.16.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] openvswitch: Fix push/pop ethernet validation
2018-10-31 17:52 [PATCH net] openvswitch: Fix push/pop ethernet validation Jaime Caamaño Ruiz
@ 2018-10-31 20:13 ` Gregory Rose
2018-11-01 1:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Gregory Rose @ 2018-10-31 20:13 UTC (permalink / raw)
To: Jaime Caamaño Ruiz, netdev; +Cc: pshelar
On 10/31/2018 10:52 AM, Jaime Caamaño Ruiz wrote:
> 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>
> ---
> net/openvswitch/flow_netlink.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
> index a70097ecf33c..865ecef68196 100644
> --- a/net/openvswitch/flow_netlink.c
> +++ b/net/openvswitch/flow_netlink.c
> @@ -3030,7 +3030,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:
> @@ -3038,7 +3038,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:
Thanks Jaime!
Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] openvswitch: Fix push/pop ethernet validation
2018-10-31 17:52 [PATCH net] openvswitch: Fix push/pop ethernet validation Jaime Caamaño Ruiz
2018-10-31 20:13 ` Gregory Rose
@ 2018-11-01 1:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-11-01 1:38 UTC (permalink / raw)
To: jcaamano; +Cc: netdev, pshelar
From: Jaime Caamaño Ruiz <jcaamano@suse.com>
Date: Wed, 31 Oct 2018 18:52:03 +0100
> 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>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-01 10:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-31 17:52 [PATCH net] openvswitch: Fix push/pop ethernet validation Jaime Caamaño Ruiz
2018-10-31 20:13 ` Gregory Rose
2018-11-01 1:38 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.