Merge pull request #3558 from brauner/2020-10-20/fixes

conf: always send response to parent waiting for devptfs_fd

conf: always send response to parent waiting for devptfs_fd

When no devpts devices are requested we used to return early but did not send a
response to the parent. This is a problem because the parent will be waiting
for a devpts fd to be sent. Make sure to always send a response.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3556 from brauner/2020-10-19/fixes

startup fixes

start: improve devpts fd sending

Closes: #3549.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

sync: log synchronization states

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

sync: switch to new error helpers

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3555 from brauner/2020-10-16/seccomp

seccomp: fix compilation on powerpc

seccomp: fix compilation on powerpc

Link: https://launchpadlibrarian.net/502200189/buildlog_snap_ubuntu_bionic_ppc64el_lxd-latest-edge_BUILDING.txt.gz
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3553 from brauner/2020-10-15/seccomp

seccomp: bugfixes

seccomp: improve default notification sending

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

seccomp: log invalid seccomp notify ids

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3548 from Drachenfels-GmbH/master

seccomp: Check if syscall is supported on compat architecture.

seccomp: Check if syscall is supported on compat architecture.

Signed-off-by: Ruben Jenster <r.jenster@drachenfels.de>

Merge pull request #3541 from Mingli-Yu/master

Remove obsolete setting regarding the Standard Output

Remove obsolete setting regarding the Standard Output

The Standard output type "syslog" is obsolete, causing a warning since systemd
version 246 [1].

Please consider using "journal" or "journal+console"

[1] https://github.com/systemd/systemd/blob/master/NEWS#L202

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>

Merge pull request #3540 from brauner/2020-09-17/fixes_2

lxc-usernsexec: setgroups() similar to other places shouldn't fail on…

lxc-usernsexec: setgroups() similar to other places shouldn't fail on EPERM

FAIL: lxc-tests: lxc-test-usernsexec (1s)
---
as test-userns executing /tmp/autopkgtest.waGEXj/build.Hm3/src/src/tests/lxc-test-usernsexec
uid=1001 gid=1001 name=test-userns subuid=165536 subgid=165536 ver=1:4.0.4-0ubuntu3
lxc-utils=1:4.0.4-0ubuntu3 kver=5.8.0-19-generic
USERNSEXEC=lxc-usernsexec
nouidgid: PASS
myuidgid: FAIL - runtest failed 1
  $ lxc-usernsexec -mu:0:1001:1 -mg:0:1001:1 -- /tmp/autopkgtest.waGEXj/build.Hm3/src/src/tests/lxc-test-usernsexec inside f0
  lxc 20200914222824.562 ERROR    utils - utils.c:lxc_setgroups:1363 - Operation not permitted - Failed to setgroups()
  kid 73112 is gone 1
subuidgid: PASS
bothsets: PASS
mismatch: PASS
ERRORS: myuidgid
---

Reported-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3539 from brauner/2020-09-17/fixes

commands: don't fail if unfreeze fails

commands: don't fail if unfreeze fails

We can e.g. fail the unfreeze because the freezer cgroup is not available and
then we erronously report that stopping the container failed.

Closes: #3471.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3532 from alliedtelesis/fix_lxc_attach_crash

avoid a NULL pointer dereference in lxc-attach

attach: use lxc_terminal_signal_sigmask_safe_blocked()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

terminal: introduce lxc_terminal_signal_sigmask_safe_blocked()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

avoid a NULL pointer dereference in lxc-attach

Seems to appear when stderr is a terminal and not stdin or stdout.

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

Merge pull request #3531 from JingWoo/cleancode

remove useless parameters

remove useless parameters

Signed-off-by: wujing <Jing.Woo@outlook.com>

Merge pull request #3530 from brauner/2020-08-25/fixes

cgroups: fix armhf builds

Merge pull request #3529 from pranaysrivastava/fixup_rootfs_detection

Check only rootfs as filesystem type

cgroups: fix armhf builds

Link: https://launchpadlibrarian.net/494473462/buildlog_ubuntu-groovy-armhf.lxc_1%3A4.0.4-0ubuntu2_BUILDING.txt.gz
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Check only rootfs as filesystem type

When detecting if rootfs is on ramfs instead of checking "- rootfs
rootfs" which is the " - <file_system> <device>" information only check
the file system type. This is due to a change introduced in kernel where
ramfs file system doesn't set the device to "rootfs" but instead mark it
as "none". By making sure we only check for "rootfs" as the file system
name we also offer backward compatibility with earlier kernels as well.

The kernel commit that introduced this change was

commit f32356261d44d580649a7abce1156d15d49cf20f
Author: David Howells <dhowells@redhat.com>
Date:   Mon Mar 25 16:38:31 2019 +0000

    vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new
    mount API

Signed-off-by: Pranay Kr. Srivastava <pranay.srivastava@pantacor.com>

Merge pull request #3528 from graysky2/master

remove deprecated options in lxc.service fixes #3527

Merge pull request #3526 from brauner/2020-08-21/fixes

cgfsng: fix cgroup attach cgroup creation

remove deprecated options in lxc.service fixes #3527

Signed-off-by: graysky <graysky@archlinux.us>

cgfsng: fix cgroup attach cgroup creation

\e[01m\e[Kcgroups/cgfsng.c:\e[m\e[K In function ‘\e[01m\e[Kcgroup_attach_leaf.constprop\e[m\e[K’:
\e[01m\e[Kcgroups/cgfsng.c:2221:10:\e[m\e[K \e[01;31m\e[Kerror: \e[m\e[Kwriting 1 byte into a region of size 0 [\e[01;31m\e[K-Werror=stringop-overflow=\e[m\e[K]
 2221 |   \e[01;31m\e[K*slash = '\0'\e[m\e[K;
      |   \e[01;31m\e[K~~~~~~~^~~~~~\e[m\e[K
\e[01m\e[Kcgroups/cgfsng.c:2213:8:\e[m\e[K \e[01;36m\e[Knote: \e[m\e[Kat offset -13 to object ‘\e[01m\e[Kattach_cgroup\e[m\e[K’ with size 23 declared here
 2213 |   char \e[01;36m\e[Kattach_cgroup\e[m\e[K[STRLITERALLEN(".lxc-1000/cgroup.procs") + 1];
      |        \e[01;36m\e[K^~~~~~~~~~~~~\e[m\e[K
\e[01m\e[Kcgroups/cgfsng.c:2229:10:\e[m\e[K \e[01;31m\e[Kerror: \e[m\e[Kwriting 1 byte into a region of size 0 [\e[01;31m\e[K-Werror=stringop-overflow=\e[m\e[K]
 2229 |   \e[01;31m\e[K*slash = '/'\e[m\e[K;
      |   \e[01;31m\e[K~~~~~~~^~~~~\e[m\e[K
\e[01m\e[Kcgroups/cgfsng.c:2213:8:\e[m\e[K \e[01;36m\e[Knote: \e[m\e[Kat offset -13 to object ‘\e[01m\e[Kattach_cgroup\e[m\e[K’ with size 23 declared here
 2213 |   char \e[01;36m\e[Kattach_cgroup\e[m\e[K[STRLITERALLEN(".lxc-1000/cgroup.procs") + 1];
      |        \e[01;36m\e[K^~~~~~~~~~~~~\e[m\e[K
\e[01m\e[Kcgroups/cgfsng.c:2229:10:\e[m\e[K \e[01;31m\e[Kerror: \e[m\e[Kwriting 1 byte into a region of size 0 [\e[01;31m\e[K-Werror=stringop-overflow=\e[m\e[K]
 2229 |   \e[01;31m\e[K*slash = '/'\e[m\e[K;
      |   \e[01;31m\e[K~~~~~~~^~~~~\e[m\e[K
\e[01m\e[Kcgroups/cgfsng.c:2213:8:\e[m\e[K \e[01;36m\e[Knote: \e[m\e[Kat offset -13 to object ‘\e[01m\e[Kattach_cgroup\e[m\e[K’ with size 23 declared here
 2213 |   char \e[01;36m\e[Kattach_cgroup\e[m\e[K[STRLITERALLEN(".lxc-1000/cgroup.procs") + 1];
      |        \e[01;36m\e[K^~~~~~~~~~~~~\e[m\e[K

Link: https://launchpadlibrarian.net/494354168/buildlog_ubuntu-groovy-armhf.lxc_1%3A4.0.4-0ubuntu1_BUILDING.txt.gz
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3522 from avr1254/master

Updated documentation to reflect lack of support for pure cgroupv2

 Updated documentation to reflect lack of support for pure cgroupv2

Signed-off-by: Arjun Ramachandrula <arjun.ramachandrula@gmail.com>

Merge pull request #3518 from brauner/2020-08-12/fixes

lsm: remove the need for atomic operations

lsm: remove the need for atomic operations

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3517 from brauner/2020-08-10/fixes_2

lsm: rewrite

lsm: use atomic in ase we're used multi-threaded

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

lsm: rework lsm handling

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3514 from brauner/2020-08-10/fixes

conf: terminal and /dev hardening

terminal: harden terminal allocation

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: move /dev setup to be file descriptor based

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3513 from brauner/2020-08-09/openat2

openat2() and safe mounting

conf: harden lxc_fill_autodev() via save_mount_beneath_at()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

file_utils: add exists_dir_at()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: make use of stashed container mountpoint fd in mount_autodev()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: stash file descriptor to root mountpoint in struct lxc_rootfs

This way we only need to open it _once_ per container startup.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

utils: introduce safe_mount_beneath_at()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgfsng: use safe_mount_beneath()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: switch mount_autodev() to new safe_mount_beneath() helper

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

utils: add safe_mount_beneath() based on openat2()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

syscalls: add openat2()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3512 from stgraber/master

lxc-download fixes

lxc-download: Fix retry loop

Closes #3511

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Revert "templates/lxc-download.in: use GPG option --receive-keys instead of --recv-keys"

This reverts commit 409040e702f814a167aed5a0e833f4d5c67fd29d.

Testing of both options show identical behavior but receive-keys does
not exist on older releases, so let's revert this.

Closes #3510

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Merge pull request #3509 from brauner/2020-08-06/fixes

api-extension: add missing seccomp_proxy_send_notify_fd extension

api-extension: add missing seccomp_proxy_send_notify_fd extension

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3508 from brauner/2020-08-06/fixes

seccomp: add seccomp_notify_fd_active api extension

seccomp: send notify fd as part of the message

Since we haven't made this official api yet: YOLO

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

seccomp: add seccomp_notify_fd_active api extension

which allows to retrieve an active seccomp notifier fd from a running
container.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3507 from brauner/2020-08-06/fixes

seccomp: don't close the mainloop, simply remove the handler

seccomp: don't close the mainloop, simply remove the handler

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3506 from brauner/2020-08-05/safe_native_terminal_allocation

macro: define TIOCGPTPEER if missing

conf: use openat() instead of open_tree()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

macro: define TIOCGPTPEER if missing

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3505 from brauner/2020-08-05/safe_native_terminal_allocation

terminal: safely allocate pts devices from inside the container

terminal: safely allocate pts devices from inside the container

This was a year long journey which seems to finally have come to an end.

Closes: #1620.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3504 from brauner/2020-08-04/fixes

conf: ensure that the idmap pointer itself is freed

conf: ensure that the idmap pointer itself is freed

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3501 from ffontaine/master

syscall: don't fail if __NR_signalfd is not defined

syscall: don't fail if __NR_signalfd is not defined

lxc fails to build if __NR_signalfd is not defined since version 4.0.0
and
https://github.com/lxc/lxc/commit/bed09c9cc0bec7bbd2442fcce4a2a0f03994cb09

However, some architectures don't define __NR_signalfd but only
__NR_signalfd4. This is the case for example for nios2 or csky:
https://github.com/bminor/glibc/blob/f9ac84f92f151e07586c55e14ed628d493a5929d/sysdeps/unix/sysv/linux/nios2/arch-syscall.h
https://github.com/bminor/glibc/blob/f9ac84f92f151e07586c55e14ed628d493a5929d/sysdeps/unix/sysv/linux/csky/arch-syscall.h

Fixes:
 - http://autobuild.buildroot.org/results/75096a48d2dbda57459523db3ed0952e63f93535

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Merge pull request #3500 from brauner/2020-07-27/seccomp_notify_cleanup

seccomp: add missing header

seccomp: add missing header

Fixes: https://launchpadlibrarian.net/490341075/buildlog_snap_ubuntu_bionic_amd64_lxd-latest-edge_BUILDING.txt.gz
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3499 from brauner/2020-07-27/seccomp_notify_cleanup

seccomp: remove seccomp fd from event loop after task exited

seccomp: remove seccomp fd from event loop after task exited

Linux v5.8 will land my patch where seccomp notifies when a filter goes unused,
i.e. when the last task using a given seccomp filter has exited. This wasn't
possible before and so we accumulated file descriptors in the container's event
loop whenever we attached to the container.
I'm not sure whether the task exiting before we could handle its syscall should
cause us to report and error or not. For now, let's simply close the event loop
and not report an error.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3498 from brauner/master

selinux: remove security_context_t usage as it's deprecated

selinux: remove security_context_t usage as it's deprecated

Link: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1888705
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3497 from brauner/2020-07-23/fix_snap_compilation

autotools: fix Makefile

Merge pull request #3496 from brauner/2020-07-18/mount_pid

new mount api support: basics

Makefile: fix Makefile

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

log: don't break logging by hiding symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

attach: use new mount api

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

mount_utils: add mount_filesystem() helper

that translates between the two mount apis.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

mount_utils: add mount utils

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

syscalls: add fsmount()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

syscalls: add fsconfig()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

syscalls: add fspick()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

syscalls: add fsopen()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #3492 from brauner/2020-07-18/visibility_hidden

tree-wide: hide unnecessary symbols

Merge pull request #3495 from siv0/boot_id_remount_apparmor_fix

apparmor: Allow ro remount of boot_id

apparmor: Allow ro remount of boot_id

The rule added in 863845075d3f77d27c91bd9f47d2f8ddc4867bd5 did not cover all
necessary mount calls for /proc/sys/kernel/random/boot_id
(in src/lxc/conf.c: lxc_setup_boot_id) - the ro remount is missing.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

start: simplify gotos

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tree-wide: hide further unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

storage: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

arguments: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

lsm: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroups: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

uuid: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

utils: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>