| Message ID | 1480462253-114713-1-git-send-email-jarno@ovn.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Nov 29, 2016 at 3:30 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> Hi Jarno, Since this is straight forward patch. can you send it separately so that we can get it merged soon? Thanks, Pravin.
> On Dec 13, 2016, at 9:07 PM, Pravin Shelar <pshelar@ovn.org> wrote: > > On Tue, Nov 29, 2016 at 3:30 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> > > Hi Jarno, > Since this is straight forward patch. can you send it separately so > that we can get it merged soon? > I just did, against net. You’ll take over the rest? Jarno > Thanks, > Pravin.
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> --- v3: No change. net/openvswitch/flow_netlink.c | 1 + 1 file changed, 1 insertion(+)