[ovs-git] Open vSwitch: tunnel: Fix bug where misconfiguration persists. (branch-2.0)

dev at openvswitch.org dev at openvswitch.org
Wed May 7 22:04:08 UTC 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, branch-2.0 has been updated
       via  2e6b2d5a0d3aab1d4ae7484feabb4946468efb4d (commit)
      from  5b6d8aeb2614c85beb49509714a063128bbbb2cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2e6b2d5a0d3aab1d4ae7484feabb4946468efb4d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=2e6b2d5a0d3aab1d4ae7484feabb4946468efb4d
Author: Joe Stringer <joestringer at nicira.com>
		
tunnel: Fix bug where misconfiguration persists.
		
Previously, misconfiguring a tunnel port to use the exact same settings
would cause the corresponding netdev to never be destroyed. When
attempting to re-use the port as a different type, this would fail and
result in a discrepancy between reported port type and actual netdev in
use.

An example configuration that would previously give unexpected behaviour:

ovs-vsctl add-port br0 p0 -- set int p0 type=gre options:remote_ip=1.2.3.4
ovs-vsctl add-port br0 p1 -- set int p1 type=internal
ovs-vsctl set int p1 type=gre options:remote_ip=1.2.3.4
ovs-vsctl set int p1 type=internal

The final command would report in the ovs-vswitchd logs that it is
attempting to configure the port with the same gre settings as p0,
despite the command specifying the type as internal. Even after
deleting and re-adding the port, the message would reappear.

This patch fixes the bug by dereferencing the netdev in the failure
case of tnl_port_add__(), and ensures that the tnl_port structure is
freed in that case as well.

Bug #1198386.

Signed-off-by: Joe Stringer <joestringer at nicira.com>
Acked-by: Ryan Wilson <wryan at vmware.com>
Acked-by: Alex Wang <alexw at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 ofproto/tunnel.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list