From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 26 Mar 2021 22:02:59 +0000 (+0100)
Subject: confile: fix returns in set_config_net_veth_vlan_tagged_id()
X-Git-Tag: lxc-5.0.0~238^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5837aa84487df2938a7d6f04db40bb12fba0013e;p=thirdparty%2Flxc.git

confile: fix returns in set_config_net_veth_vlan_tagged_id()

Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32494
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 73ffce7eb..9f3088756 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -525,6 +525,7 @@ static int set_config_net_veth_vlan_id(const char *key, const char *value,
 		netdev->priv.veth_attr.vlan_id = BRIDGE_VLAN_NONE;
 	} else {
 		unsigned short vlan_id;
+
 		ret = get_u16(&vlan_id, value, 0);
 		if (ret < 0)
 			return ret_errno(EINVAL);
@@ -555,10 +556,10 @@ static int set_config_net_veth_vlan_tagged_id(const char *key, const char *value
 
 	ret = get_u16(&vlan_id, value, 0);
 	if (ret < 0)
-		ret_errno(EINVAL);
+		return ret_errno(EINVAL);
 
 	if (vlan_id > BRIDGE_VLAN_ID_MAX)
-		ret_errno(EINVAL);
+		return ret_errno(EINVAL);
 
 	list = lxc_list_new();
 	if (!list)