]> git.ipfire.org Git - thirdparty/lxc.git/log
thirdparty/lxc.git
4 years agotests: add tests for read-only /sys with read-write /sys/devices/virtual/net 3888/head
Christian Brauner [Wed, 30 Jun 2021 11:41:46 +0000 (13:41 +0200)] 
tests: add tests for read-only /sys with read-write /sys/devices/virtual/net

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: improve read-only /sys with read-write /sys/devices/virtual/net
Christian Brauner [Wed, 30 Jun 2021 11:22:15 +0000 (13:22 +0200)] 
conf: improve read-only /sys with read-write /sys/devices/virtual/net

Some tools require /sys/devices/virtual/net to be read-write. At the
same time we want all other parts of /sys to be read-only. To do this we
created a layout where we hade a read-only instance of sysfs mounted on
top of a read-write instance of sysfs:

`-/sys                                  sysfs                                                        sysfs      rw,nosuid,nodev,noexec,relatime
  `-/sys                                sysfs                                                        sysfs      ro,nosuid,nodev,noexec,relatime
    |-/sys/devices/virtual/net          sysfs                                                        sysfs      rw,relatime
    | `-/sys/devices/virtual/net        sysfs[/devices/virtual/net]                                  sysfs      rw,nosuid,nodev,noexec,relatime

This causes issues for systemd services that create a separate mount
namespace as they get confused to what mount options need to be
respected.

Simplify our mounting logic so we end up with a single read-only mount
of sysfs on /sys and a read-write bind-mount of /sys/devices/virtual/net:

├─/sys                                sysfs                                                                                  sysfs         ro,nosuid,nodev,noexec,relatime
│ ├─/sys/devices/virtual/net          sysfs[/devices/virtual/net]                                                            sysfs         rw,nosuid,nodev,noexec,relatime

Link: systemd/systemd#20032
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3885 from tych0/dont-exec-execute
Christian Brauner [Tue, 29 Jun 2021 14:08:19 +0000 (16:08 +0200)] 
Merge pull request #3885 from tych0/dont-exec-execute

execute: don't exec init, call it

4 years agoexecute: ensure parent is notified about child exec and close all unneeded fds 3885/head
Christian Brauner [Tue, 29 Jun 2021 08:32:31 +0000 (10:32 +0200)] 
execute: ensure parent is notified about child exec and close all unneeded fds

lxc_container_init() creates the container payload process as it's child
so lxc_container_init() itself never really exits and thus the parent
isn't notified about the child exec'ing since the sync file descriptor
is never closed. Make sure it's closed to notify the parent about the
child's exec.

In addition we're currently leaking all file descriptors associated with
the handler into the stub init. Make sure that all file descriptors
other than stderr are closed.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agonetwork: log network devices while sending
Christian Brauner [Tue, 29 Jun 2021 08:32:05 +0000 (10:32 +0200)] 
network: log network devices while sending

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoinitutils: use vfork() in lxc_container_init()
Christian Brauner [Tue, 29 Jun 2021 08:31:17 +0000 (10:31 +0200)] 
initutils: use vfork() in lxc_container_init()

We can let the child finish calling exec before continuing in the
parent.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoexecute: don't exec init, call it
Tycho Andersen [Mon, 28 Jun 2021 14:38:48 +0000 (08:38 -0600)] 
execute: don't exec init, call it

Instead of having a statically linked init that we put on the host fs
somewhere via packaging, have to either bind mount in or detect fexecve()
functionality, let's just call it as a library function. This way we don't
have to do any of that.

This also fixes up a bunch of conditions from:

if (quiet)
    fprintf(stderr, "log message");

to

if (!quiet)
    fprintf(stderr, "log message");

:)

and it drops all the code for fexecve() detection and bind mounting our
init in, since we no longer need any of that.

A couple other thoughts:

* I left the lxc-init binary in since we ship it, so someone could be using
  it outside of the internal uses.
* There are lots of unused arguments to lxc-init (including presumably
  --quiet, since nobody noticed the above); those may be part of the API
  though and so we don't want to drop them.

Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
4 years agoMerge pull request #3877 from tomasz-blaszczak-red/fix-crash-after-remove-from-array
Wolfgang Bumiller [Tue, 29 Jun 2021 06:54:43 +0000 (08:54 +0200)] 
Merge pull request #3877 from tomasz-blaszczak-red/fix-crash-after-remove-from-array

remove_from_array() causes a crash

4 years agoWhen an item is added to an array, then the array is realloc()ed (to size+1), 3877/head
Tomasz Blaszczak [Wed, 23 Jun 2021 07:17:05 +0000 (09:17 +0200)] 
When an item is added to an array, then the array is realloc()ed (to size+1),
and the item is copied (strdup()) to the array.
Thus, when an item is removed from an array, memory allocated for that item
should be freed, successive items should be left-shifted and the array
realloc()ed again (size-1).

Additional changes:
- If strdup() fails in add_to_array(), then an array should be
  realloc()ed again to original size.
- Initialize an array in list_all_containers().

Signed-off-by: Tomasz Blaszczak <tomasz.blaszczak@consult.red>
4 years agoMerge pull request #3884 from brauner/2021-06-28.fixes
Wolfgang Bumiller [Mon, 28 Jun 2021 10:32:11 +0000 (12:32 +0200)] 
Merge pull request #3884 from brauner/2021-06-28.fixes

cgroups: verify that hierarchies are non-empty

4 years agocgroups: verify that hierarchies are non-empty 3884/head
Christian Brauner [Mon, 28 Jun 2021 07:44:20 +0000 (09:44 +0200)] 
cgroups: verify that hierarchies are non-empty

Fixes: #3881
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3882 from stgraber/master
Christian Brauner [Mon, 28 Jun 2021 07:39:50 +0000 (09:39 +0200)] 
Merge pull request #3882 from stgraber/master

lxc-download: Switch GPG server

4 years agolxc-download: Switch GPG server 3882/head
Stéphane Graber [Mon, 28 Jun 2021 03:42:52 +0000 (23:42 -0400)] 
lxc-download: Switch GPG server

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
4 years agoResize array in remove_from_array() and fix a crash
Tomasz Blaszczak [Fri, 25 Jun 2021 10:04:49 +0000 (12:04 +0200)] 
Resize array in remove_from_array() and fix a crash

When an item is added to an array, then the array is realloc()ed (to size+1),
and the item is copied (strdup()) to the array.
Thus, when an item is removed from an array, allocated memory pointed by
the item (not the item itself) should be freed, successive items should
be left-shifted and the array realloc()ed again (size-1).

Additional changes:
- Initialize an array in list_all_containers().

Signed-off-by: Tomasz Blaszczak <tomasz.blaszczak@consult.red>
4 years agoWhen an item is added to an array, then the array is realloc()ed (to size+1),
Tomasz Blaszczak [Wed, 23 Jun 2021 07:17:05 +0000 (09:17 +0200)] 
When an item is added to an array, then the array is realloc()ed (to size+1),
and the item is copied (strdup()) to the array.
Thus, when an item is removed from an array, memory allocated for that item
should be freed, successive items should be left-shifted and the array
realloc()ed again (size-1).

Additional changes:
- If strdup() fails in add_to_array(), then an array should be
  realloc()ed again to original size.
- Initialize an array in list_all_containers().

Signed-off-by: Tomasz Blaszczak <tomasz.blaszczak@consult.red>
4 years agoMerge pull request #3870 from brauner/2021-06-16.fixes
Stéphane Graber [Wed, 16 Jun 2021 12:42:55 +0000 (08:42 -0400)] 
Merge pull request #3870 from brauner/2021-06-16.fixes

cgroups: use stable ordering for co-mounted v1 controllers

4 years agocgroups: use stable ordering for co-mounted v1 controllers 3870/head
Christian Brauner [Wed, 16 Jun 2021 08:03:42 +0000 (10:03 +0200)] 
cgroups: use stable ordering for co-mounted v1 controllers

Fixes: #3703
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3867 from brauner/2021-06-14.fixes
Stéphane Graber [Mon, 14 Jun 2021 17:41:50 +0000 (13:41 -0400)] 
Merge pull request #3867 from brauner/2021-06-14.fixes

remove problematic terminology

4 years agotree-wide: replace problematic terminology 3867/head
Christian Brauner [Mon, 14 Jun 2021 15:26:24 +0000 (17:26 +0200)] 
tree-wide: replace problematic terminology

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agotree-wide: replace problematic terminology
Christian Brauner [Mon, 14 Jun 2021 15:25:39 +0000 (17:25 +0200)] 
tree-wide: replace problematic terminology

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agotree-wide: replace problematic terminology
Christian Brauner [Mon, 14 Jun 2021 15:21:44 +0000 (17:21 +0200)] 
tree-wide: replace problematic terminology

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agotree-wide: remove problematic terminology
Christian Brauner [Mon, 14 Jun 2021 15:15:43 +0000 (17:15 +0200)] 
tree-wide: remove problematic terminology

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoseccomp: replace problematic terminology
Christian Brauner [Mon, 14 Jun 2021 15:14:26 +0000 (17:14 +0200)] 
seccomp: replace problematic terminology

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agocommon.conf: replace problematic terminology
Christian Brauner [Mon, 14 Jun 2021 15:13:00 +0000 (17:13 +0200)] 
common.conf: replace problematic terminology

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3865 from brauner/2021-06-14.listen_fds
Christian Brauner [Mon, 14 Jun 2021 11:29:20 +0000 (13:29 +0200)] 
Merge pull request #3865 from brauner/2021-06-14.listen_fds

Add support for LISTEN_FDS environment variable.

4 years agoAdd support for LISTEN_FDS environment variable. 3865/head
Ruben Jenster [Wed, 2 Jun 2021 14:31:31 +0000 (16:31 +0200)] 
Add support for LISTEN_FDS environment variable.

The LISTEN_FDS environment variable defines the number of
file descriptors that should be inherited by the container,
in addition to stdio.
The LISTEN_FDS environment variable is defined in the OCI spec
and used to support socket activation.

Refs #3845

Signed-off-by: Ruben Jenster <r.jenster@drachenfels.de>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3864 from lifeng68/master
Christian Brauner [Mon, 14 Jun 2021 09:34:14 +0000 (11:34 +0200)] 
Merge pull request #3864 from lifeng68/master

string utils: Make sure don't return uninitialized memory.

4 years agostring utils: Make sure don't return uninitialized memory. 3864/head
LiFeng [Sat, 12 Jun 2021 06:52:46 +0000 (14:52 +0800)] 
string utils: Make sure don't return uninitialized memory.

The function lxc_string_split_quoted and lxc_string_split_and_trim use
realloc to reduce the memory. But the result may be NULL, the the
returned memory will be uninitialized

Signed-off-by: LiFeng <lifeng68@huawei.com>
4 years agoMerge pull request #3861 from brauner/2021-06-08.fixes.2
Stéphane Graber [Tue, 8 Jun 2021 14:46:00 +0000 (10:46 -0400)] 
Merge pull request #3861 from brauner/2021-06-08.fixes.2

api_extensions: introduce idmapped_mounts_v2 api extension

4 years agoapi_extensions: introduce idmapped_mounts_v2 api extension 3861/head
Christian Brauner [Tue, 8 Jun 2021 13:59:13 +0000 (15:59 +0200)] 
api_extensions: introduce idmapped_mounts_v2 api extension

This indicates that LXC supports idmapping the rootfs and
idmapped lxc.mount.entry entries.

Link: https://github.com/lxc/lxd/issues/8870
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3860 from brauner/2021-06-08.fixes
Stéphane Graber [Tue, 8 Jun 2021 13:21:35 +0000 (09:21 -0400)] 
Merge pull request #3860 from brauner/2021-06-08.fixes

tools/lxc_autostart: fix failed count

4 years agotools/lxc_autostart: fix failed count 3860/head
Christian Brauner [Tue, 8 Jun 2021 12:59:12 +0000 (14:59 +0200)] 
tools/lxc_autostart: fix failed count

Don't include skipped containers in the failed count.

Fixes: #3857
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3856 from brauner/2021-06-07.fixes
Stéphane Graber [Mon, 7 Jun 2021 14:31:32 +0000 (10:31 -0400)] 
Merge pull request #3856 from brauner/2021-06-07.fixes

lsm/apparmor: actually report an error when we fail to wire AppArmor …

4 years agolsm/apparmor: actually report an error when we fail to wire AppArmor profile 3856/head
Christian Brauner [Mon, 7 Jun 2021 13:37:38 +0000 (15:37 +0200)] 
lsm/apparmor: actually report an error when we fail to wire AppArmor profile

Link: https://bugs.launchpad.net/ubuntu-kernel-tests/+bug/1931064
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3854 from brauner/2021-06-03.fixes
Stéphane Graber [Thu, 3 Jun 2021 15:21:35 +0000 (11:21 -0400)] 
Merge pull request #3854 from brauner/2021-06-03.fixes

lxc: add lpthread to lxc.pc

4 years agolxc: add lpthread to lxc.pc 3854/head
Christian Brauner [Thu, 3 Jun 2021 13:37:11 +0000 (15:37 +0200)] 
lxc: add lpthread to lxc.pc

Fixes: #3853
Suggested-by: Tycho Andersen <tycho@tycho.pizza>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3852 from pablofsf/lxc-net-nftables
Stéphane Graber [Fri, 28 May 2021 20:28:57 +0000 (16:28 -0400)] 
Merge pull request #3852 from pablofsf/lxc-net-nftables

Update lxc-net to support nftables

4 years agoUpdate lxc-net to support nftables 3852/head
Pablo Correa Gómez [Thu, 27 May 2021 13:43:31 +0000 (15:43 +0200)] 
Update lxc-net to support nftables

Closes #3093
Closes #3602

Add support for nftables firewall rules if `nft` command line
interface is available in the system

Signed-off-by: Pablo Correa Gómez <ablocorrea@hotmail.com>
4 years agoMerge pull request #3851 from brauner/2021-05-25.fixes
Stéphane Graber [Tue, 25 May 2021 13:56:43 +0000 (09:56 -0400)] 
Merge pull request #3851 from brauner/2021-05-25.fixes

fixes

4 years agonetwork: please broken compilers 3851/head
Christian Brauner [Tue, 25 May 2021 12:24:01 +0000 (14:24 +0200)] 
network: please broken compilers

Some users report that compilation fails because of reports that this
variable can be used uninitialized. Initialize it to silence the
compiler.

Fixes: https://github.com/lxc/lxc/issues/3850
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3849 from stgraber/master
Christian Brauner [Tue, 25 May 2021 07:01:34 +0000 (09:01 +0200)] 
Merge pull request #3849 from stgraber/master

README: Update IRC

4 years agoREADME: Update IRC 3849/head
Stéphane Graber [Mon, 24 May 2021 04:18:01 +0000 (00:18 -0400)] 
README: Update IRC

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
4 years agoMerge pull request #3848 from brauner/2021-05-21.fixes
Stéphane Graber [Fri, 21 May 2021 16:25:56 +0000 (12:25 -0400)] 
Merge pull request #3848 from brauner/2021-05-21.fixes

start: rework fd synchronization

4 years agostart: simplify startup synchronization 3848/head
Christian Brauner [Fri, 21 May 2021 10:14:47 +0000 (12:14 +0200)] 
start: simplify startup synchronization

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agostart: reorder START_SYNC_POST_CONFIGURE
Christian Brauner [Fri, 21 May 2021 09:18:21 +0000 (11:18 +0200)] 
start: reorder START_SYNC_POST_CONFIGURE

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agostart: use barrier instead of wake/wait pair
Christian Brauner [Fri, 21 May 2021 09:07:33 +0000 (11:07 +0200)] 
start: use barrier instead of wake/wait pair

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: use explicit signage in bit field
Christian Brauner [Fri, 21 May 2021 08:30:38 +0000 (10:30 +0200)] 
conf: use explicit signage in bit field

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: move file descriptor synchronization with parent into single function
Christian Brauner [Fri, 21 May 2021 08:12:29 +0000 (10:12 +0200)] 
conf: move file descriptor synchronization with parent into single function

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: move file descriptor synchronization with child into single function
Christian Brauner [Fri, 21 May 2021 08:06:27 +0000 (10:06 +0200)] 
conf: move file descriptor synchronization with child into single function

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agocgroups: rework check whether legacy hierarchy is writable
Christian Brauner [Fri, 21 May 2021 15:24:38 +0000 (17:24 +0200)] 
cgroups: rework check whether legacy hierarchy is writable

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3846 from brauner/2021-05-19.fixes
Stéphane Graber [Wed, 19 May 2021 18:09:14 +0000 (14:09 -0400)] 
Merge pull request #3846 from brauner/2021-05-19.fixes

conf: fix mount option parsing

4 years agoconf: fix mount option parsing 3846/head
Christian Brauner [Wed, 19 May 2021 15:38:20 +0000 (17:38 +0200)] 
conf: fix mount option parsing

Fixes: Coverity 1484906
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3843 from brauner/2021-05-17.idmapped.lxc.mount.entry
Stéphane Graber [Wed, 19 May 2021 13:55:26 +0000 (09:55 -0400)] 
Merge pull request #3843 from brauner/2021-05-17.idmapped.lxc.mount.entry

conf: support idmapped lxc.mount.entry entries

4 years agoconfile: free mount data 3843/head
Christian Brauner [Tue, 18 May 2021 18:23:17 +0000 (20:23 +0200)] 
confile: free mount data

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: add sequence when setting up idmapped mounts
Christian Brauner [Wed, 19 May 2021 09:12:04 +0000 (11:12 +0200)] 
conf: add sequence when setting up idmapped mounts

Make sure we catch any weird behavior.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: support idmapped lxc.mount.entry entries
Christian Brauner [Mon, 17 May 2021 09:41:38 +0000 (11:41 +0200)] 
conf: support idmapped lxc.mount.entry entries

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3844 from CecilHarvey/master
Christian Brauner [Tue, 18 May 2021 19:37:14 +0000 (21:37 +0200)] 
Merge pull request #3844 from CecilHarvey/master

Skip rootfs pinning for read-only file system.

4 years agoSkip rootfs pinning for read-only file system. 3844/head
Wei Mingzhi [Tue, 18 May 2021 12:37:52 +0000 (20:37 +0800)] 
Skip rootfs pinning for read-only file system.

Signed-off-by: Wei Mingzhi <weimingzhi@baidu.com>
4 years agoconf: rename struct mount_opt flag member s/flag/legacy_flag/
Christian Brauner [Mon, 17 May 2021 10:42:50 +0000 (12:42 +0200)] 
conf: rename struct mount_opt flag member s/flag/legacy_flag/

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agotree-wide: s/parse_mntopts/parse_mntopts_legacy/
Christian Brauner [Mon, 17 May 2021 10:35:37 +0000 (12:35 +0200)] 
tree-wide: s/parse_mntopts/parse_mntopts_legacy/

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3842 from brauner/2021-05-14.fixes
Stéphane Graber [Fri, 14 May 2021 17:49:18 +0000 (13:49 -0400)] 
Merge pull request #3842 from brauner/2021-05-14.fixes

start: move idmapped mount setup later

4 years agostart: move idmapped mount setup later 3842/head
Christian Brauner [Fri, 14 May 2021 17:00:14 +0000 (19:00 +0200)] 
start: move idmapped mount setup later

At the prior location we we're placed between sending and receiving
networking information over the data socket causing the startup to fail.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3840 from brauner/2021-05-12.fixes.rootfs
Stéphane Graber [Wed, 12 May 2021 13:03:33 +0000 (09:03 -0400)] 
Merge pull request #3840 from brauner/2021-05-12.fixes.rootfs

conf: fix containers without rootfs

4 years agoconf: tweak rootfs handling 3840/head
Christian Brauner [Wed, 12 May 2021 07:34:26 +0000 (09:34 +0200)] 
conf: tweak rootfs handling

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: don't unmount procfs and sysfs
Christian Brauner [Wed, 12 May 2021 08:19:25 +0000 (10:19 +0200)] 
conf: don't unmount procfs and sysfs

Fixes: #3838
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: allow xdev when setting up /dev
Christian Brauner [Wed, 12 May 2021 07:18:53 +0000 (09:18 +0200)] 
conf: allow xdev when setting up /dev

Fixes: #3838
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3837 from brauner/2021-05-10.fixes.cgroup
Stéphane Graber [Tue, 11 May 2021 12:51:27 +0000 (08:51 -0400)] 
Merge pull request #3837 from brauner/2021-05-10.fixes.cgroup

cgroups: clean up cgroup_ops on initialization error

4 years agocgroups: clean up cgroup_ops on initialization error 3837/head
Christian Brauner [Tue, 11 May 2021 07:05:03 +0000 (09:05 +0200)] 
cgroups: clean up cgroup_ops on initialization error

Fixes: #3836
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3826 from brauner/2021-05-04.fuzz.cgroup
Stéphane Graber [Mon, 10 May 2021 16:12:56 +0000 (12:12 -0400)] 
Merge pull request #3826 from brauner/2021-05-04.fuzz.cgroup

oss-fuzz: add basic cgroup_init()/cgroup_exit() fuzzing

4 years agoMerge pull request #3834 from brauner/2021-05-10.fixes
Stéphane Graber [Mon, 10 May 2021 15:25:51 +0000 (11:25 -0400)] 
Merge pull request #3834 from brauner/2021-05-10.fixes

tests: fix lxc-test-arch-parse for make dist

4 years agotests: fix lxc-test-arch-parse for make dist 3834/head
Christian Brauner [Mon, 10 May 2021 15:05:04 +0000 (17:05 +0200)] 
tests: fix lxc-test-arch-parse for make dist

Fixes: https://jenkins.linuxcontainers.org/job/lxc-build-tarballs/2762/console
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3833 from brauner/2021-05-09.fixes
Stéphane Graber [Sun, 9 May 2021 17:03:17 +0000 (13:03 -0400)] 
Merge pull request #3833 from brauner/2021-05-09.fixes

confile: re-add aarch64 architecture

4 years agotests: add tests for supported architectures 3833/head
Christian Brauner [Sun, 9 May 2021 14:11:12 +0000 (16:11 +0200)] 
tests: add tests for supported architectures

Ensure that we detect all supported architectures and don't regress
recognizing them.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconfile: re-add aarch64 architecture
Christian Brauner [Sun, 9 May 2021 13:44:59 +0000 (15:44 +0200)] 
confile: re-add aarch64 architecture

Apparenty we dropped this when we cleaned up architecture handling.

Fixes: #3832
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3831 from sjuxax/zfs-fix
Christian Brauner [Sun, 9 May 2021 12:28:23 +0000 (14:28 +0200)] 
Merge pull request #3831 from sjuxax/zfs-fix

Skip rootfs pinning for ZFS roots.

4 years agoReflow ZFS check to follow the style of the overlayfs return. 3831/head
Jeff Cook [Sun, 9 May 2021 11:29:05 +0000 (05:29 -0600)] 
Reflow ZFS check to follow the style of the overlayfs return.

Per https://github.com/lxc/lxc/pull/3831#discussion_r628865713

Signed-off-by: Jeff Cook <jeff@jeffcook.io>
4 years agoSkip rootfs pinning for ZFS roots.
Jeff Cook [Sun, 9 May 2021 02:46:42 +0000 (20:46 -0600)] 
Skip rootfs pinning for ZFS roots.

Signed-off-by: Jeff Cook <jeff@jeffcook.io>
4 years agoMerge pull request #3829 from brauner/2021-05-07.fixes
Stéphane Graber [Fri, 7 May 2021 15:52:05 +0000 (11:52 -0400)] 
Merge pull request #3829 from brauner/2021-05-07.fixes

doc: document new idmap= option for lxc.rootfs.options

4 years agodoc: document new idmap= option for lxc.rootfs.options 3829/head
Christian Brauner [Fri, 7 May 2021 15:21:18 +0000 (17:21 +0200)] 
doc: document new idmap= option for lxc.rootfs.options

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3827 from brauner/2021-05-06.cap_setfcap
Stéphane Graber [Thu, 6 May 2021 16:42:23 +0000 (12:42 -0400)] 
Merge pull request #3827 from brauner/2021-05-06.cap_setfcap

conf: handle kernels with CAP_SETFCAP

4 years agoconf: handle kernels with CAP_SETFCAP 3827/head
Christian Brauner [Thu, 6 May 2021 16:16:45 +0000 (18:16 +0200)] 
conf: handle kernels with CAP_SETFCAP

LXC is being very clever and sometimes maps the caller's uid into the
child userns. This means that the caller can technically write fscaps
that are valid in the ancestor userns (which can be a security issue in
some scenarios) so newer kernels require CAP_SETFCAP to do this. Until
newuidmap/newgidmap are updated to account for this simply write the
mapping directly in this case.

Cc: stable-4.0
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agooss-fuzz: add basic cgroup_init()/cgroup_exit() fuzzing 3826/head
Christian Brauner [Tue, 4 May 2021 16:40:15 +0000 (18:40 +0200)] 
oss-fuzz: add basic cgroup_init()/cgroup_exit() fuzzing

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3825 from brauner/2021-05-04.fixes
Stéphane Graber [Tue, 4 May 2021 14:54:52 +0000 (10:54 -0400)] 
Merge pull request #3825 from brauner/2021-05-04.fixes

lxc.arch fixes

4 years agoattach: introduce explicit personality macro 3825/head
Christian Brauner [Tue, 4 May 2021 14:16:36 +0000 (16:16 +0200)] 
attach: introduce explicit personality macro

Introduce LXC_ATTACH_DETECT_PERSONALITY to make it explicit what is
happening instead of using -1.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: add personality_t
Christian Brauner [Tue, 4 May 2021 14:09:48 +0000 (16:09 +0200)] 
conf: add personality_t

Catch errors in personality handling better.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoattach_options: unbreak header
Christian Brauner [Tue, 4 May 2021 13:43:38 +0000 (15:43 +0200)] 
attach_options: unbreak header

In a moment of idioticity I switch -1 with 0xffffffff in the header
definition but we use -1 to autodetect.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: rework lxc_config_parse_arch()
Christian Brauner [Tue, 4 May 2021 11:38:52 +0000 (13:38 +0200)] 
conf: rework lxc_config_parse_arch()

Fix architecture parsing. So far we couldn't really differ between "want
default architecture" and "failed to parse requested architecture"
because the -1 return value means both. Fix this by using the return
value only to indicate success or failure and return the parsed
personality in a return argument.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconf: tweak setup_personality()
Christian Brauner [Tue, 4 May 2021 11:30:20 +0000 (13:30 +0200)] 
conf: tweak setup_personality()

Use the dedicated LXC_ARCH_UNCHANGED macro everywhere instead of relying
on -1 being correct.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agotree-wide: make personality codepaths unconditional
Christian Brauner [Tue, 4 May 2021 11:27:20 +0000 (13:27 +0200)] 
tree-wide: make personality codepaths unconditional

Now that we have the infra to make personality handling unconitional
remove the ifndefs everywhere.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agosyscalls: wrap personality syscall if undefined
Christian Brauner [Tue, 4 May 2021 11:21:28 +0000 (13:21 +0200)] 
syscalls: wrap personality syscall if undefined

There's no need to making personality handling conditional as it has
been around for such a long time that only weird systems wouldn't have
support for it. And especially if the user requested a specific
personality to be set but the system doesn't support the personality
syscall we should loudly fail instead of moving on.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agocommands: log at debug not info level when receiving file descriptors
Christian Brauner [Tue, 4 May 2021 06:59:24 +0000 (08:59 +0200)] 
commands: log at debug not info level when receiving file descriptors

Don't spam the logs because we do receive a lot of file descriptors.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoconfile: make per_name struct static
Christian Brauner [Tue, 4 May 2021 06:57:52 +0000 (08:57 +0200)] 
confile: make per_name struct static

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
4 years agoMerge pull request #3823 from evverx/gcc-11-workaround
Christian Brauner [Tue, 4 May 2021 03:10:35 +0000 (05:10 +0200)] 
Merge pull request #3823 from evverx/gcc-11-workaround

string_utils: get around GCC-11 false positives

4 years agoMerge pull request #3824 from evverx/sanitizers-follow-ups
Stéphane Graber [Mon, 3 May 2021 23:59:44 +0000 (19:59 -0400)] 
Merge pull request #3824 from evverx/sanitizers-follow-ups

github: remove the dh-* packages

4 years agostring_utils: get around GCC-11 false positives 3823/head
Evgeny Vereshchagin [Mon, 3 May 2021 20:44:05 +0000 (20:44 +0000)] 
string_utils: get around GCC-11 false positives

by getting rid of stpncpy

Tested with gcc (GCC) 11.1.1 20210428 (Red Hat 11.1.1-1)

Closes https://github.com/lxc/lxc/issues/3752

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
4 years agogithub: also pass the j option to make 3824/head
Evgeny Vereshchagin [Mon, 3 May 2021 22:35:19 +0000 (22:35 +0000)] 
github: also pass the j option to make

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
4 years agogithub: remove the dh-* packages
Evgeny Vereshchagin [Mon, 3 May 2021 22:31:55 +0000 (22:31 +0000)] 
github: remove the dh-* packages

We don't build any packages there so it seems we don't need
those packages any more. Apart from that, it should make the
script work on Ubuntu Hirsute where dh-systemd was merged into
debhelper and is no longer available.

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
4 years agoMerge pull request #3819 from dev-aaront-org/console-mode-messages
Stéphane Graber [Mon, 3 May 2021 12:03:25 +0000 (08:03 -0400)] 
Merge pull request #3819 from dev-aaront-org/console-mode-messages

conf: fix console chmod error log messages

4 years agoMerge pull request #3822 from stgraber/master
Christian Brauner [Mon, 3 May 2021 12:03:14 +0000 (14:03 +0200)] 
Merge pull request #3822 from stgraber/master

github: Run apt-get update in sanitizer test

4 years agoMerge pull request #3820 from brauner/2021-05-03.lxc_monitord.log
Stéphane Graber [Mon, 3 May 2021 12:03:03 +0000 (08:03 -0400)] 
Merge pull request #3820 from brauner/2021-05-03.lxc_monitord.log

lxc_monitord: remove monitord log