mirror of
https://github.com/systemd/systemd.git
synced 2024-10-31 07:51:21 +03:00
nspawn: fix truncation of machine names in interface names
Based on patch by Michael Marineau <michael.marineau@coreos.com>: When deriving the network interface name from machine name strncpy was not properly null terminating the string and the maximum string size as returned by strlen() is actually IFNAMSIZ-1, not IFNAMSIZ.
This commit is contained in:
parent
9a6f36c08f
commit
4212a3375e
Notes:
Lennart Poettering
2014-08-19 21:03:07 +02:00
Backport: bugfix
@ -1659,11 +1659,8 @@ static int setup_veth(pid_t pid, char iface_name[IFNAMSIZ], int *ifi) {
|
||||
|
||||
/* Use two different interface name prefixes depending whether
|
||||
* we are in bridge mode or not. */
|
||||
if (arg_network_bridge)
|
||||
memcpy(iface_name, "vb-", 3);
|
||||
else
|
||||
memcpy(iface_name, "ve-", 3);
|
||||
strncpy(iface_name+3, arg_machine, IFNAMSIZ - 3);
|
||||
snprintf(iface_name, IFNAMSIZ, "%s-%s",
|
||||
arg_network_bridge ? "vb" : "ve", arg_machine);
|
||||
|
||||
r = get_mac(&mac);
|
||||
if (r < 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user