SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nspawn: check validity of the internal interface name only explicitly specified

Browse Source 
Follow-up for 2f091b1b49.

Fixes #28844.
This commit is contained in:
Yu Watanabe
2023-08-24 15:55:32 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent 6d9829e724
commit 927e20fa49
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-network.c
+12 -10
View File
@@ -774,20 +774,22 @@ static int network_iface_pair_parse(const char* iftype, char ***l, const char *p
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"%s, interface name not valid: %s", iftype, a);
if (isempty(interface)) {
if (ifprefix)
b = strjoin(ifprefix, a);
else
b = strdup(a);
} else
/* Here, we only check the validity of the specified second name. If it is not specified,
* the copied or prefixed name should be already valid, except for its length. If it is too
* long, then it will be shortened later. */
if (!isempty(interface)) {
if (!ifname_valid(interface))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"%s, interface name not valid: %s", iftype, interface);
b = strdup(interface);
} else if (ifprefix)
b = strjoin(ifprefix, a);
else
b = strdup(a);
if (!b)
return log_oom();
if (!ifname_valid(b))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"%s, interface name not valid: %s", iftype, b);
r = strv_consume_pair(l, TAKE_PTR(a), TAKE_PTR(b));
if (r < 0)
return log_oom();