Commits · b49f36bcdbea7a34bdce9d4331663da17ecade61 · Chen Yisong / lxc

26 Feb, 2021 12 commits

Merge pull request #3700 from brauner/2021-02-26/fixes_2 · b49f36bc
Stéphane Graber authored Feb 26, 2021
```
small fixes
```
b49f36bc
start: fix whitespace error · cfe6f435
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
cfe6f435
af_unix: vet all parameters · d961ebd9
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
d961ebd9
Merge pull request #3699 from brauner/2021-02-26/network · 88e27cd6
Stéphane Graber authored Feb 26, 2021
```
network: fix networks with switched names
```
88e27cd6

network: use two passes through networks · 3a197a1b

authored Feb 26, 2021

Consider the following network layout:

 lxc.net.0.type = phys
 lxc.net.0.link = eth2
 lxc.net.0.name = eth%d

 lxc.net.1.type = phys
 lxc.net.1.link = eth1
 lxc.net.1.name = eth0

If we simply follow this order and create the first network first the kernel
will allocate eth0 for the first network but the second network requests
that eth1 be renamed to eth0 in the container's network namespace which
would lead to a clash.

Note, we don't handle cases like:

 lxc.net.0.type = phys
 lxc.net.0.link = eth2
 lxc.net.0.name = eth0

 lxc.net.1.type = phys
 lxc.net.1.link = eth1
 lxc.net.1.name = eth0

That'll brutally fail of course but there's nothing we can do about it. But
this can happen when e.g. a has the following LXD configuration:

devices:
  eth2:
    name: eth0
    nictype: physical
    parent: eth2
    type: nic
  eth3:
    name: eth0
    nictype: physical
    parent: eth3
    type: nic

in the container's config and the default profile has:

devices:
  eth0:
    name: eth0
    network: lxdbr0
    type: nic
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

3a197a1b

network: handle name collisions when renaming network devices · fdd6be55

authored Feb 26, 2021

LXC moves network devices into the target namespace based on their created
name. The created name can either be randomly generated for e.g. veth
devices or it can be the name of the existing device in the server's
namespaces. This is e.g. the case when moving physical devices. However this
can lead to weird clashes. Consider we have a network namespace that has the
following devices:

4: eth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
   link/ether 00:16:3e:91:d3:ae brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:e7:5d:10
   altname enp7s0
5: eth2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
   link/ether 00:16:3e:e7:5d:10 brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:91:d3:ae
   altname enp8s0

and the user generates the following network config for their container:

 lxc.net.0.type = phys
 lxc.net.0.name = eth1
 lxc.net.0.link = eth2

 lxc.net.1.type = phys
 lxc.net.1.name = eth2
 lxc.net.1.link = eth1

This would cause LXC to move the devices eth1 and eth2 from the server's
network namespace into the container's network namespace:

24: eth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
    link/ether 00:16:3e:91:d3:ae brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:e7:5d:10
    altname enp7s0
25: eth2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default qlen 1000
    link/ether 00:16:3e:e7:5d:10 brd ff:ff:ff:ff:ff:ff permaddr 00:16:3e:91:d3:ae
     altname enp8s0

According to the network config above we now need to rename the network
devices in the container's network namespace. Let's say we start with
renaming eth2 to eth1. This would immediately lead to a clash since the
container's network namespace already contains a network device with that
name. Renaming the other device would have the same problem.

There are multiple ways to fix this but I'm concerned with keeping the logic
somewhat reasonable which is why we simply start creating transient device
names that are unique which we'll use to move and rename the network device
in the container's network namespace at the same time. And then we rename
based on those random devices names to the target name.

Fixes: #3696
Reported-by: Sam Boyles <sam.boyles@alliedtelesis.co.nz>
Reported-by: Blair Steven <blair.steven@alliedtelesis.co.nz>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

fdd6be55

network: add lxc_network_info struct · 3392d379
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
3392d379
network: fix grammar · 4a037d61
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
4a037d61
confile_utils: ensure memory is zeroed · 9dffc40e
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
9dffc40e
network: fix coding style in lxc_create_network_unpriv_exec() · 071d0934
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
071d0934
network: make callback naming consistent and understandable · bad2f913
Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
bad2f913
Merge pull request #3698 from brauner/2021-02-25/fixes · 32d40452
Stéphane Graber authored Feb 25, 2021
```
tree-wide: some more logging fixes
```
32d40452

25 Feb, 2021 28 commits
- tree-wide: replace old-style sysinfo logging return helper · 815c378b
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  815c378b
- tree-wide: replace old systrace logging helpers · b1b38fd1
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  b1b38fd1
- tree-wide: use new logging helpers · 6d95e0b7
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  6d95e0b7
- log: mark logging helpers to use · 81d90ee5
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  81d90ee5
- tree-wide: replace remaining instances of syserrno() with syserror_ret() · 9fc21b2d
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  9fc21b2d
- tree-wide: start replacing instances of syserrno() with syserror() · 2d7b0895
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  2d7b0895
- tree-wide: s/syerrno_set()/syserror_set()/g · 060aaa39
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  060aaa39
- commands: unify fd retrieval commands · 6d829cd2
  Christian Brauner authored Feb 26, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  6d829cd2
- commands: fix indentation · 89d51b22
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  89d51b22
- commands: rsp_one_fd_{reap,keep}() and rsp_many_fds_reap() · 46b576e5
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  46b576e5
- commands: cleanup error handling and variable naming · 5f241268
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  5f241268
- Merge pull request #3697 from brauner/2021-02-25/fixes · cca31bf0
  Stéphane Graber authored Feb 25, 2021
```
commands: improvements and fixes
```
  cca31bf0
- commands: port misnamed functions to general style · 885bb002
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  885bb002
- commands: use debug logging · daad4f95
  Christian Brauner authored Feb 25, 2021
```
It is fine to fail these commands when a new client talks to an old server or
the kernel doesn't support the necessary features.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  daad4f95
- log: add some more log and return helpers · 8aa82616
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  8aa82616
- tests: add logging to lxc-test-lxc-attach · 161e4bef
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  161e4bef
- commands: improve lxc_cmd_get_tty_fd() · d2560c4e
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  d2560c4e
- commands: rework lxc_cmd_rsp_recv() to make it more obvious · 3a9daa04
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  3a9daa04
- af_unix: allow caller and callee to negotiate expectations and reality · 780215cf
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  780215cf
- macro: add hweight*() helpers · 265dc73a
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  265dc73a
- commands: let lxc_cmd() return ssize_t to indicate that it returns not just 0 on success · 57fc2dd7
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  57fc2dd7
- commands: port lxc_cmd_get_limit_cgroup2_fd() to new helpers · 962c70c5
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  962c70c5
- commands: port lxc_cmd_get_cgroup2_fd() to new helpers · dab4f69f
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  dab4f69f
- commands: port lxc_cmd_get_limit_cgroup_fd() to new helpers · 3d7661aa
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  3d7661aa
- commands: port lxc_cmd_get_cgroup_fd() to new helpers · e83494bb
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  e83494bb
- commands: port lxc_cmd_unfreeze() to new helpers · 558cb2b5
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  558cb2b5
- commands: port lxc_cmd_freeze() to new helpers · ac91e515
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  ac91e515
- commands: port lxc_cmd_seccomp_notify_add_listener() to new helpers · 6e662117
  Christian Brauner authored Feb 25, 2021
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  6e662117