From: Thomas Parrott <thomas.parrott@canonical.com>
Date: Tue, 9 Jun 2020 12:02:54 +0000 (+0100)
Subject: network: Adds free_ovs_veth_vlan_args and allows trunks field to be freed
X-Git-Tag: lxc-5.0.0~421^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2f8b2720be301566290efa24f3b2aaee2968852;p=thirdparty%2Flxc.git

network: Adds free_ovs_veth_vlan_args and allows trunks field to be freed

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
---

diff --git a/src/lxc/network.c b/src/lxc/network.c
index b0e614e42..f206be55b 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -421,9 +421,13 @@ struct ovs_veth_vlan_args {
 	const char *nic;
 	const char *vlan_mode;	/* Port VLAN mode. */
 	short vlan_id;		/* PVID VLAN ID. */
-	const char *trunks;	/* Comma delimited list of tagged VLAN IDs. */
+	char *trunks;		/* Comma delimited list of tagged VLAN IDs. */
 };
 
+static inline void free_ovs_veth_vlan_args(struct ovs_veth_vlan_args *args)
+{
+	free_disarm(args->trunks);
+}
 
 static int lxc_ovs_setup_bridge_vlan_exec(void *data)
 {