From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 9 Dec 2020 08:30:40 +0000 (+0100)
Subject: confile: cleanup get_config_net_ipv6_gateway()
X-Git-Tag: lxc-5.0.0~330^2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8009ed2ea1a28def6d5d99968245e356309b9b5;p=thirdparty%2Flxc.git

confile: cleanup get_config_net_ipv6_gateway()

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 7714671b2..8e2012f39 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -6093,14 +6093,15 @@ static int get_config_net_ipv6_gateway(const char *key, char *retv, int inlen,
 		memset(retv, 0, inlen);
 
 	if (!netdev)
-		return -1;
+		return ret_errno(EINVAL);
 
 	if (netdev->ipv6_gateway_auto) {
 		strprint(retv, inlen, "auto");
 	} else if (netdev->ipv6_gateway_dev) {
 		strprint(retv, inlen, "dev");
 	} else if (netdev->ipv6_gateway) {
-		inet_ntop(AF_INET6, netdev->ipv6_gateway, buf, sizeof(buf));
+		if (!inet_ntop(AF_INET6, netdev->ipv6_gateway, buf, sizeof(buf)))
+			return -errno;
 		strprint(retv, inlen, "%s", buf);
 	}