Merge pull request #4161 from srd424/patch-1

Fix errors constructing mount string when extra mount options supplied

Store mount options in correct variable

This was exposed by the fix in the previous commit.

Signed-off-by: srd424 <srd424@users.noreply.github.com>

Fix off-by-one error constructing mount options

This fixes a really subtle off-by-one error constructing overlay mount options if rootfs options are provided and modern overlayfs (i.e. requiring a workdir) is used. We need to allow for the extra "," required to separate the extra options when computing the length!

Signed-off-by: srd424 <srd424@users.noreply.github.com>

Merge pull request #4159 from Blub/meson/statvfs

add check for statvfs

Merge pull request #4158 from brauner/2022-07-01.fixes

start: fix namespace sharing

add check for statvfs

we use HAVE_STATVFS in the code but with meson the check got
lost causing mount_entry to fail to remount some things such
as a bind mount of /dev/fuse via

    lxc.mount.entry = /dev/fuse dev/fuse none bind,create=file 0 0

which would cause the following log messages:

    DEBUG    conf - ../src/lxc/conf.c:mount_entry:2416 - Remounting "/dev/fuse" on "/usr/lib/x86_64-linux-gnu/lxc/rootfs/dev/fuse" to respect bind or remount options
    ERROR    conf - ../src/lxc/conf.c:mount_entry:2459 - Operation not permitted - Failed to mount "/dev/fuse" on "/usr/lib/x86_64-linux-gnu/lxc/rootfs/dev/fuse"

note that the `Flags for ... were ...` line is not showing
up there, which depends on HAVE_STATVFS

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

Merge pull request #4147 from marcfiu/issue-4026

fix for issue #4026: set broadcast to 0.0.0.0 for /31 and /32

start: fix namespace sharing

Fixes: #4134
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>

Merge pull request #4157 from brauner/2022-06-30.fixes

conf: fix append_ttyname()

conf: fix append_ttyname()

We appended container_tty= and then used setenv(container_tty, ...)
resulting int container_tty=container_tty=.

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

Merge pull request #4154 from brauner/2022-06-29.fixes

conf: startup fixes

start: record inherited namespaces earlier to make it available for idmapped rootfs setup

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

start: don't overwrite file descriptors during namespace preservation

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

conf: log file descriptors on error during idmapped mount setup

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

fix for issue 4026: set broadcast to 0.0.0.0 for /31 and /32

Signed-off-by: Marc E. Fiuczynski <mfiuczyn@akamai.com>

Merge pull request #4153 from brauner/2022-06-21.unprivileged-cgroup2

use systemd dbus StartTransientUnit for unpriv cgroup2

use systemd dbus StartTransientUnit for unpriv cgroup2

If, when init'ing cgroups for a container start, we detect that we
are an unprivileged user on a unified-hierarchy-only system, then we
try to request systemd, through dbus api, to create a new scope for
us with delegation.  Call the cgroup it creates for us P1.  We then
create P1/init, move ourselves into there, so we can enable the
controllers for delegation to P1's children through P1/cgroup.subtree_control.

On attach, we try to request systemd attach us to the container's
scope.  We can't do that ourselves in the normal case, as root owns
our login cgroups.

Create a new command api for the lxc monitor to tell lxc-attach the
systemd scope to which to attach.

Changelog:
 * free cgroup_meta.systemd_scope in lxc_conf_free (Thanks Tycho)
 * fix some indent
 * address some (not all) of brauner's feedback

Signed-off-by: Serge Hallyn <serge@hallyn.com>

Merge pull request #4149 from petris/lxc_multicall

tools: Provide multicall lxc binary

meson: Set DEVEL flag post release

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

Release LXC 5.0.0

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

tools: Provide multicall lxc binary

Create a binary, which embeds all lxc tools similar way as busybox
embeds its applets. This is handy for embedded systems as it saves
roughly 90% of the disk space.

To disable normal tools and use multicall binary exclusively use the
following meson setup options:
  -Dtools=false -Dtools-multicall=true

Signed-off-by: Petr Malat <oss@malat.biz>

meson: Generate compile commands by iterating over an array

This makes it possible to add a new command without updating multiple
places in the meson file.

Signed-off-by: Petr Malat <oss@malat.biz>

Merge pull request #4148 from stgraber/master

meson: Fix bad strerror_r check

meson: Fix bad strerror_r check

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

Merge pull request #4146 from brauner/2022-06-13.fixes

build: fixes

build: map autotools options to meson options in meson_options.txt

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

README: reflect meson in the documentation

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

build: add missing memfd-rexec option

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

build: support thread-safety enforcement as option

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

build: use cc.links() to check for static libcap

Fixes: #4144
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>

Merge pull request #4142 from brauner/2022-06-09.build.fixes

tests: fix oss-fuzz port to meson

oss-fuzz: cleanup build flags

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

oss-fuzz: ensure binaries are zipped

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

oss-fuzz: adapt options to oss-fuzz build

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

oss-fuzz: handle dependencies

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

build: separate oss-fuzz tests from regular test builds

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

github/workflows/cifuzz: update to Ubuntu 22.04

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

build: add oss-fuzz switch

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

build: add seccomp build option

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

build: fix build with various options turned off

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

build: tweak build flags

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

Merge pull request #4141 from lxc/dependabot/github_actions/actions/upload-artifact-3

build(deps): bump actions/upload-artifact from 1 to 3

build(deps): bump actions/upload-artifact from 1 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 1 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v1...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #4140 from turrisxyz/Dependabot-GitHub-Actions

chore: Included githubactions in the dependabot config

chore: Included githubactions in the dependabot config

This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.

Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot

GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>

Merge pull request #4139 from stgraber/master

Github workflow fixes

github: Fix compiler version task for coverity

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

github: Fix bad syntax in cifuzz

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

Merge pull request #4137 from brauner/2022-06-08.stgraber.master

build: remove autotools and finish meson port

github/workflows/sanitizers: port sanitizers builds to meson

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

github/workflows: port all workflows to Ubuntu 22.04

So we have a new enough meson version everywhere.

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

github/workflows/cifuzz: ensure necessary paths are added

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

github/workflows/build: remove sanitizer build

We have a separate workflow for this.

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

github/workflows/build: add -Db_lto_mode=default

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

github/workflows/build: install lvvm as well

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

oss-fuzz: more meson options

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

build: lxc-init doesn't need to build the whole config infra

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

build: add additional command line switches

In order to compile for fuzzers where we will need and want to turn a
bunch of things off add command line switches that allow us to do so.

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

build: use liblxc_sources everywhere

The old split didn't buy us a lot and causes problems when buidling with
sanitizers enabled so just use the full sources.

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

config: make lxc-{containers,net}.in executable

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

Merge pull request #4136 from turrisxyz/Pinned-Dependencies-GitHub

chore: Set permissions for GitHub actions

meson: Always defined IS_BIONIC

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

src: Don't use ifdef/defined for config.h

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

github: Update coverity workflow for meson

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

github: Update build test for meson

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

README: Update for meson

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

doc: Update for meson

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

meson: Add basic Makefile

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

Remove autotools

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

chore: Set permissions for GitHub actions

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: neilnaveen <42328488+neilnaveen@users.noreply.github.com>

Merge pull request #4135 from stgraber/meson

More meson fixes

meson: Fix mntent include condition

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

lxc/rexec: Use HAVE_FEXECVE

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

meson: Add lxcmntent to unmount-namespace hook

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

meson: Add missing prlimit include

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

meson: Only build seccomp and selinux when needed

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

meson: Always define HAVE_LIBURING

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

meson: seccomp is optional

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

meson: Fix on shallow git trees

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

meson: Add bionic detection

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

meson: Fix RPM spec variables

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

meson: Make lxc-user-nic setuid

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

meson: Don't include lxc-test-fuzzers

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

meson: Skip static library when using sanitizer

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

meson: Cleanup and fix includes

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

meson: Add coverity flag

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

Merge pull request #4133 from dasteihn/sta/fallthrough

CODING_STYLE: add forgotten fallthrough

CODING_STYLE: add forgotten fallthrough

Signed-off-by: Philipp Stanner <stanner@posteo.de>

Merge pull request #4130 from stgraber/master

Finalize the meson port

meson: Add RPM spec

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

meson: Rework configuration variables

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

meson: Tweak config for manpages

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

meson: Export more variables to doc

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

meson: Export LXC_DISTRO_SYSCONF

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

Merge pull request #4126 from stgraber/master

Complete meson port

meson: Add apparmor profiles

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

meson: Add sysconfig

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

meson: Add init scripts

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

meson: Rename want_io_uring

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

meson: Make docbook2man required if user requested doc

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