From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 1 Sep 2017 10:54:43 +0000 (+0200)
Subject: network: non-functional changes
X-Git-Tag: lxc-2.0.9~48^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a840c5a4f8f12405cfe6a868ee8257db8fb6a461;p=thirdparty%2Flxc.git

network: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/network.c b/src/lxc/network.c
index a4476ccb2..242e1d39d 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -1889,7 +1889,10 @@ char *lxc_mkifname(const char *template)
 	struct ifaddrs *ifaddr, *ifa;
 	int ifexists = 0;
 
-	/* Get all the network interfaces */
+	if (strlen(template) >= IFNAMSIZ)
+		return NULL;
+
+	/* Get all the network interfaces. */
 	getifaddrs(&ifaddr);
 
 	/* Initialize the random number generator */
@@ -2361,7 +2364,7 @@ int lxc_create_network_priv(struct lxc_handler *handler)
 int lxc_network_move_created_netdev_priv(const char *lxcpath, char *lxcname,
 					 struct lxc_list *network, pid_t pid)
 {
-	int err;
+	int ret;
 	char ifname[IFNAMSIZ];
 	struct lxc_list *iterator;
 
@@ -2381,16 +2384,17 @@ int lxc_network_move_created_netdev_priv(const char *lxcpath, char *lxcname,
 			return -1;
 		}
 
-		err = lxc_netdev_move_by_name(ifname, pid, NULL);
-		if (err) {
+		ret = lxc_netdev_move_by_name(ifname, pid, NULL);
+		if (ret) {
 			ERROR("Failed to move network device \"%s\" to "
 			      "network namespace %d: %s", ifname, pid,
-			      strerror(-err));
+			      strerror(-ret));
 			return -1;
 		}
 
 		DEBUG("Moved network device \"%s\"/\"%s\" to network namespace "
-		      "of %d:", ifname, netdev->name[0] != '\0' ? netdev->name : "(null)",
+		      "of %d:",
+		      ifname, netdev->name[0] != '\0' ? netdev->name : "(null)",
 		      pid);
 	}
 
@@ -2705,8 +2709,7 @@ static int lxc_setup_netdev_in_child_namespaces(struct lxc_netdev *netdev)
 		if (netdev->type != LXC_NET_VETH) {
 			net_type_name = lxc_net_type_to_str(netdev->type);
 			ERROR("%s networks are not supported for containers "
-			      "not setup up by privileged users",
-			      net_type_name);
+			      "not setup up by privileged users", net_type_name);
 			return -1;
 		}
 
diff --git a/src/lxc/network.h b/src/lxc/network.h
index 331d98208..3f49a13d8 100644
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -174,15 +174,12 @@ struct saved_nic {
 /* Convert a string mac address to a socket structure. */
 extern int lxc_convert_mac(char *macaddr, struct sockaddr *sockaddr);
 
-/*
- * Move a device between namespaces
- */
-extern int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char* ifname);
-extern int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char* newname);
+/* Move a device between namespaces. */
+extern int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char *ifname);
+extern int lxc_netdev_move_by_name(const char *ifname, pid_t pid,
+				   const char *newname);
 
-/*
- * Delete a network device
- */
+/* Delete a network device. */
 extern int lxc_netdev_delete_by_name(const char *name);
 extern int lxc_netdev_delete_by_index(int ifindex);