commit 2b716b186fdfe0a40d6ddb9e43c795bb05d1ca10
author Matthew Smith <mgsmith@netgate.com> Fri Oct 22 09:53:44 2021 -0500
committer Damjan Marion <dmarion@me.com> Thu Oct 28 11:00:57 2021 +0000
tree 95b03d9ddf0c57149b90aa71e418046bea42824a
parent c19ac303404966433096c4855a8192f746973522

tap: handle null namespace and bridge correctly

Type: fix

In tap_create_if(), if args->host_namespace or args->host_bridge are
null because no values were set for those, the virtio_if_t entry in
virtio_main.interfaces ends up getting populated with values of "(nil)"
in net_ns or host_bridge, respectively.

Check whether args->host_namespace and args->host_bridge are null before
trying to set the corresponding fields on virtio_if_t.

Change-Id: I8e1e66a6d7b246e7c66fece406d116ffb1312c64
Signed-off-by: Matthew Smith <mgsmith@netgate.com>

src/vnet/devices/tap/tap.c

diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c
index 2cca1fb..2d075f9 100644
--- a/src/vnet/devices/tap/tap.c
+++ b/src/vnet/devices/tap/tap.c
@@ -625,10 +625,12 @@
 	ethernet_mac_address_generate (args->mac_addr.bytes);
 
       clib_memcpy (vif->mac_addr, args->mac_addr.bytes, 6);
-      vif->host_bridge = format (0, "%s%c", args->host_bridge, 0);
+      if (args->host_bridge)
+	vif->host_bridge = format (0, "%s%c", args->host_bridge, 0);
     }
   vif->host_if_name = format (0, "%s%c", host_if_name, 0);
-  vif->net_ns = format (0, "%s%c", args->host_namespace, 0);
+  if (args->host_namespace)
+    vif->net_ns = format (0, "%s%c", args->host_namespace, 0);
   vif->host_mtu_size = args->host_mtu_size;
   vif->tap_flags = args->tap_flags;
   clib_memcpy (vif->host_mac_addr, args->host_mac_addr.bytes, 6);