| Message ID | 1482195993-97937-1-git-send-email-jarno@ovn.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> On Dec 19, 2016, at 5:06 PM, Jarno Rajahalme <jarno@ovn.org> wrote: > > Add a break statement to prevent fall-through from > OVS_KEY_ATTR_ETHERNET to OVS_KEY_ATTR_TUNNEL. Without the break > actions setting ethernet addresses fail to validate with log messages > complaining about invalid tunnel attributes. > > Fixes: 0a6410fbde ("openvswitch: netlink: support L3 packets") > Signed-off-by: Jarno Rajahalme <jarno@ovn.org> > Acked-by: Pravin B Shelar <pshelar@ovn.org> > Acked-by: Jiri Benc <jbenc@redhat.com> > --- > net/openvswitch/flow_netlink.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c > index d19044f..c87d359 100644 > --- a/net/openvswitch/flow_netlink.c > +++ b/net/openvswitch/flow_netlink.c > @@ -2195,6 +2195,7 @@ static int validate_set(const struct nlattr *a, > case OVS_KEY_ATTR_ETHERNET: > if (mac_proto != MAC_PROTO_ETHERNET) > return -EINVAL; > + break; > > case OVS_KEY_ATTR_TUNNEL: > if (masked) > -- > 2.1.4 > I posted this separately from an earlier net-next patch series. Pravin agreed to pick up that rest of the series (skb->protocol w/ vlans). Jarno
From: Jarno Rajahalme <jarno@ovn.org> Date: Mon, 19 Dec 2016 17:06:33 -0800 > Add a break statement to prevent fall-through from > OVS_KEY_ATTR_ETHERNET to OVS_KEY_ATTR_TUNNEL. Without the break > actions setting ethernet addresses fail to validate with log messages > complaining about invalid tunnel attributes. > > Fixes: 0a6410fbde ("openvswitch: netlink: support L3 packets") > Signed-off-by: Jarno Rajahalme <jarno@ovn.org> > Acked-by: Pravin B Shelar <pshelar@ovn.org> > Acked-by: Jiri Benc <jbenc@redhat.com> Applied.
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index d19044f..c87d359 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -2195,6 +2195,7 @@ static int validate_set(const struct nlattr *a, case OVS_KEY_ATTR_ETHERNET: if (mac_proto != MAC_PROTO_ETHERNET) return -EINVAL; + break; case OVS_KEY_ATTR_TUNNEL: if (masked)
Add a break statement to prevent fall-through from OVS_KEY_ATTR_ETHERNET to OVS_KEY_ATTR_TUNNEL. Without the break actions setting ethernet addresses fail to validate with log messages complaining about invalid tunnel attributes. Fixes: 0a6410fbde ("openvswitch: netlink: support L3 packets") Signed-off-by: Jarno Rajahalme <jarno@ovn.org> Acked-by: Pravin B Shelar <pshelar@ovn.org> Acked-by: Jiri Benc <jbenc@redhat.com> --- net/openvswitch/flow_netlink.c | 1 + 1 file changed, 1 insertion(+)