]> git.ipfire.org Git - thirdparty/lxc.git/log
thirdparty/lxc.git
10 months agomeson.build: drop suggest-attribute=noreturn build option
Serge Hallyn [Thu, 3 Oct 2024 18:41:39 +0000 (13:41 -0500)] 
meson.build: drop suggest-attribute=noreturn build option

The suggest-attribute=noreturn option marks functions which will
never return, to give the compiler some hints.  It catches all of
our src/lxc/tools/*.c *_main functions as follows:

error: function might be candidate for attribute ‘noreturn’ [-Werror=suggest-attribute=noreturn]

But if we mark those __noreturn, then  the compiler complains that:

../src/lxc/tools/lxc_attach.c:320:53: warning: ‘main’ specifies less restrictive attribute than its target ‘lxc_attach_main’: ‘noreturn’ [-Wmissi
ng-attributes]
  320 | int __attribute__((weak, alias("lxc_attach_main"))) main(int argc, char *argv[]);

This recommendation is really not very important, so let's not ask
the build to warn about it.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
10 months agomeson.build: add -ffat-lto-objects
Serge Hallyn [Mon, 16 Sep 2024 12:47:34 +0000 (07:47 -0500)] 
meson.build: add -ffat-lto-objects

Otherwise, if we generate a static library, lintian warns that
it has no code sections.  See

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977596

Signed-off-by: Serge Hallyn <serge@hallyn.com>
12 months agoRelease LXC 6.0.2 v6.0.2
Stéphane Graber [Mon, 16 Sep 2024 15:52:57 +0000 (17:52 +0200)] 
Release LXC 6.0.2

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
12 months agofix possible clang compile error in AARCH
yuncang123 [Sat, 14 Sep 2024 18:03:01 +0000 (02:03 +0800)] 
fix possible clang compile error in AARCH

Signed-off-by: yuncang123 <135211779+yuncang123@users.noreply.github.com>
12 months agoREADME: Update security contact
Stéphane Graber [Sun, 25 Aug 2024 17:17:59 +0000 (13:17 -0400)] 
README: Update security contact

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
12 months agodoc: Fix definitions of get_config_path and set_config_path
Stéphane Graber [Wed, 7 Aug 2024 18:10:59 +0000 (14:10 -0400)] 
doc: Fix definitions of get_config_path and set_config_path

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
12 months agoExit 0 when there's no error
Jip-Hop [Tue, 9 Jul 2024 10:33:36 +0000 (12:33 +0200)] 
Exit 0 when there's no error

Signed-off-by: Jip de Beer <2871973+Jip-Hop@users.noreply.github.com>
12 months agoidmap: Lower logging level of newXidmap tools to INFO
Stéphane Graber [Tue, 16 Jul 2024 14:08:31 +0000 (10:08 -0400)] 
idmap: Lower logging level of newXidmap tools to INFO

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
12 months agoRemove unused function
Stéphane Graber [Wed, 5 Jun 2024 22:40:15 +0000 (18:40 -0400)] 
Remove unused function

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
15 months agoRelease LXC 6.0.1 v6.0.1
Stéphane Graber [Thu, 27 Jun 2024 04:43:29 +0000 (00:43 -0400)] 
Release LXC 6.0.1

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
15 months agomeson: fix build with -Dtools-multicall=true on NixOS
Alexander Mikhalitsyn [Wed, 26 Jun 2024 18:42:55 +0000 (20:42 +0200)] 
meson: fix build with -Dtools-multicall=true on NixOS

See also:
https://github.com/lxc/lxc/pull/4428

Fixes: #4427
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agogithub: exclude clang & ubuntu-24.04 combination
Alexander Mikhalitsyn [Wed, 26 Jun 2024 17:47:31 +0000 (19:47 +0200)] 
github: exclude clang & ubuntu-24.04 combination

Temporary workaround for:
https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-18/+bug/2064187

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agolxc/storage/zfs: ignore false-positive use-after-free warning
Alexander Mikhalitsyn [Wed, 26 Jun 2024 17:28:03 +0000 (19:28 +0200)] 
lxc/storage/zfs: ignore false-positive use-after-free warning

free(dataset) is perfecly valid after failed realloc(dataset, len) call.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agogithub: properly check apparmor profile changes
Alexander Mikhalitsyn [Tue, 4 Jun 2024 11:49:59 +0000 (13:49 +0200)] 
github: properly check apparmor profile changes

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agogithub: start using ubuntu-24.04
Alexander Mikhalitsyn [Tue, 4 Jun 2024 11:49:19 +0000 (13:49 +0200)] 
github: start using ubuntu-24.04

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agoapparmor: regenerate rules
Alexander Mikhalitsyn [Wed, 5 Jun 2024 12:38:06 +0000 (14:38 +0200)] 
apparmor: regenerate rules

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agoapparmor: use /{,**} instead of /**
Alexander Mikhalitsyn [Wed, 5 Jun 2024 12:33:31 +0000 (14:33 +0200)] 
apparmor: use /{,**} instead of /**

It turned out, that old (and incorrect) rule:
mount options=(rw,make-slave) -> **,

is NOT equivalent to:
mount options=(rw,make-slave) -> /**,

Let's use:
mount options=(rw,make-slave) -> /{,**},

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agoapparmor: regenerate rules
Alexander Mikhalitsyn [Tue, 4 Jun 2024 11:30:51 +0000 (13:30 +0200)] 
apparmor: regenerate rules

Follow the instruction from config/apparmor/README:

./lxc-generate-aa-rules.py container-rules.base > container-rules
cat abstractions/container-base.in container-rules > abstractions/container-base

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agoapparmor: fix rule path pattern specification syntax
Alexander Mikhalitsyn [Tue, 4 Jun 2024 11:28:05 +0000 (13:28 +0200)] 
apparmor: fix rule path pattern specification syntax

See also:
https://bugs.launchpad.net/lxc/+bug/2064144
https://github.com/lxc/incus/pull/889/commits/d2c13e3f6312f08750981a80a510530e881c4ec7

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agolxc-local: remove check for template existence before extraction
Jacob McNamee [Wed, 22 May 2024 14:02:14 +0000 (07:02 -0700)] 
lxc-local: remove check for template existence before extraction

This check always fails because template files do not exist until the
rootfs is unpacked. File existence is already confirmed before replacing
variables

Signed-off-by: Jacob McNamee <jacob@jacobmcnamee.com>
15 months agolxc-local: fix incorrect path to `templates` file
Jacob McNamee [Wed, 22 May 2024 13:44:17 +0000 (06:44 -0700)] 
lxc-local: fix incorrect path to `templates` file

Signed-off-by: Jacob McNamee <jacob@jacobmcnamee.com>
15 months agolxc-local: fix use of `LXC_PATH` before init
Jacob McNamee [Wed, 22 May 2024 13:34:08 +0000 (06:34 -0700)] 
lxc-local: fix use of `LXC_PATH` before init

Signed-off-by: Jacob McNamee <jacob@jacobmcnamee.com>
15 months agoUpdate lxc-execute.sgml.in
KATOH Yasufumi [Fri, 17 May 2024 07:47:16 +0000 (16:47 +0900)] 
Update lxc-execute.sgml.in

Update for a7aa297

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
15 months agoUpdate lxc-{attach,execute}.sgml.in
KATOH Yasufumi [Fri, 17 May 2024 07:21:04 +0000 (16:21 +0900)] 
Update lxc-{attach,execute}.sgml.in

Update for 52bf34d and a7aa297

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
15 months agoUpdate lxc-execute.sgml.in
MMFuba [Sun, 12 May 2024 19:17:57 +0000 (21:17 +0200)] 
Update lxc-execute.sgml.in

add hint to use numerical values for uid and gid

Signed-off-by: MMFuba <114305581+MMFuba@users.noreply.github.com>
15 months agoUpdate lxc-attach.sgml.in
MMFuba [Sun, 12 May 2024 19:13:36 +0000 (21:13 +0200)] 
Update lxc-attach.sgml.in

added hint to use numerical value for uid and gid

Signed-off-by: MMFuba <114305581+MMFuba@users.noreply.github.com>
15 months agonetwork: netdev_configure_server_veth: reduce scope of disable_ipv6_fd/path vars
Alexander Mikhalitsyn [Mon, 8 Apr 2024 10:29:08 +0000 (12:29 +0200)] 
network: netdev_configure_server_veth: reduce scope of disable_ipv6_fd/path vars

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agolxc/network: handle non-existing sysctl <ifname>/disable_ipv6
Alexander Mikhalitsyn [Mon, 8 Apr 2024 10:21:21 +0000 (12:21 +0200)] 
lxc/network: handle non-existing sysctl <ifname>/disable_ipv6

Skip writting to /proc/sys/net/ipv6/conf/<ifname>/disable_ipv6
if it does not exist.

Fixes: #4431
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agogithub: test the lxc multicall binary builds too
Alexander Mikhalitsyn [Sat, 6 Apr 2024 20:11:12 +0000 (22:11 +0200)] 
github: test the lxc multicall binary builds too

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
15 months agomeson: fix build on NixOS
Alexander Mikhalitsyn [Fri, 5 Apr 2024 15:50:58 +0000 (17:50 +0200)] 
meson: fix build on NixOS

Fixes: #4427
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agoRelease LXC 6.0.0 v6.0.0
Stéphane Graber [Wed, 3 Apr 2024 03:33:26 +0000 (23:33 -0400)] 
Release LXC 6.0.0

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoMerge pull request #4424 from stgraber/main
Serge Hallyn [Wed, 3 Apr 2024 02:47:03 +0000 (21:47 -0500)] 
Merge pull request #4424 from stgraber/main

Cleanup MAINTAINERS, COPYING and sort out SPDX headers

18 months agolxc.spec: Align SPDX license id 4424/head
Stéphane Graber [Wed, 3 Apr 2024 00:43:37 +0000 (20:43 -0400)] 
lxc.spec: Align SPDX license id

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoMakefile: Align SPDX license id
Stéphane Graber [Wed, 3 Apr 2024 00:43:30 +0000 (20:43 -0400)] 
Makefile: Align SPDX license id

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agomeson: Align SPDX license id
Stéphane Graber [Wed, 3 Apr 2024 00:42:09 +0000 (20:42 -0400)] 
meson: Align SPDX license id

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoCOPYING: Clarify licensing of files without SPDX
Stéphane Graber [Wed, 3 Apr 2024 00:29:39 +0000 (20:29 -0400)] 
COPYING: Clarify licensing of files without SPDX

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agodoc: Add SPDX headers and remove Author field
Stéphane Graber [Wed, 3 Apr 2024 00:23:13 +0000 (20:23 -0400)] 
doc: Add SPDX headers and remove Author field

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agosrc/include: Add SPDX headers
Stéphane Graber [Tue, 2 Apr 2024 22:31:26 +0000 (18:31 -0400)] 
src/include: Add SPDX headers

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agosrc/tests: Add SPDX headers
Stéphane Graber [Tue, 2 Apr 2024 22:24:10 +0000 (18:24 -0400)] 
src/tests: Add SPDX headers

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agohooks: Add SPDX headers
Stéphane Graber [Tue, 2 Apr 2024 21:59:17 +0000 (17:59 -0400)] 
hooks: Add SPDX headers

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agolxc.spec: Clear default changelog
Stéphane Graber [Tue, 2 Apr 2024 21:54:04 +0000 (17:54 -0400)] 
lxc.spec: Clear default changelog

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agolxc.spec: Use SPDX
Stéphane Graber [Tue, 2 Apr 2024 21:52:37 +0000 (17:52 -0400)] 
lxc.spec: Use SPDX

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agotemplate: Use SPDX
Stéphane Graber [Tue, 2 Apr 2024 21:51:55 +0000 (17:51 -0400)] 
template: Use SPDX

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoconfig/yum: Use SPDX header
Stéphane Graber [Tue, 2 Apr 2024 21:50:03 +0000 (17:50 -0400)] 
config/yum: Use SPDX header

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoCOPYING: Remove whitespace
Stéphane Graber [Tue, 2 Apr 2024 21:49:54 +0000 (17:49 -0400)] 
COPYING: Remove whitespace

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoMAINTAINERS: Remove Dwight from the maintainer list
Stéphane Graber [Tue, 2 Apr 2024 21:45:23 +0000 (17:45 -0400)] 
MAINTAINERS: Remove Dwight from the maintainer list

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoMerge pull request #4377 from adamcstephens/install-options
Stéphane Graber [Tue, 2 Apr 2024 17:46:34 +0000 (13:46 -0400)] 
Merge pull request #4377 from adamcstephens/install-options

build: add more options for customizing install

18 months agoMerge pull request #4423 from stgraber/main
Serge Hallyn [Tue, 2 Apr 2024 15:51:03 +0000 (10:51 -0500)] 
Merge pull request #4423 from stgraber/main

lxc-checkconfig improvements

18 months agolxc-checkconfig: Fix shellcheck 4423/head
Stéphane Graber [Tue, 2 Apr 2024 15:26:48 +0000 (11:26 -0400)] 
lxc-checkconfig: Fix shellcheck

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agolxc-checkconfig: Show namespace limits
Stéphane Graber [Tue, 2 Apr 2024 15:21:43 +0000 (11:21 -0400)] 
lxc-checkconfig: Show namespace limits

Closes #4259

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
18 months agoMerge pull request #4422 from mihalicyn/ct_list_fix
Stéphane Graber [Tue, 2 Apr 2024 14:53:31 +0000 (10:53 -0400)] 
Merge pull request #4422 from mihalicyn/ct_list_fix

lxc-ls: list names with whitespaces in `--active`.

18 months agolxc-ls: list names with whitespaces in `--active`. 4422/head
Edênis Freindorfer Azevedo [Wed, 15 Sep 2021 03:12:52 +0000 (00:12 -0300)] 
lxc-ls: list names with whitespaces in `--active`.

Fixes: #3970
Signed-off-by: Edênis Freindorfer Azevedo <edenisfa@gmail.com>
[ small fixes ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agoMerge pull request #4421 from mihalicyn/lxc_copy_fixes
Stéphane Graber [Tue, 2 Apr 2024 13:07:45 +0000 (09:07 -0400)] 
Merge pull request #4421 from mihalicyn/lxc_copy_fixes

lxc/tools: set default log_priority to ERROR

18 months agoMerge pull request #4418 from mihalicyn/cumulative_fixes_2apr2024
Stéphane Graber [Tue, 2 Apr 2024 13:05:54 +0000 (09:05 -0400)] 
Merge pull request #4418 from mihalicyn/cumulative_fixes_2apr2024

confile_utils: fix incorrect multiply_overflow test #2

18 months agoMerge pull request #4420 from mihalicyn/autostart_fix
Christian Brauner [Tue, 2 Apr 2024 12:55:51 +0000 (14:55 +0200)] 
Merge pull request #4420 from mihalicyn/autostart_fix

tools/lxc_autostart: don't fail when there are no containers

18 months agoMerge pull request #4419 from mihalicyn/fixup_mod_rdep
Christian Brauner [Tue, 2 Apr 2024 12:55:16 +0000 (14:55 +0200)] 
Merge pull request #4419 from mihalicyn/fixup_mod_rdep

lxc/lxccontainer: specify file mode in open() call inside mod_rdep

18 months agolxc/tools: set default log_priority to ERROR 4421/head
Alexander Mikhalitsyn [Tue, 2 Apr 2024 11:58:35 +0000 (13:58 +0200)] 
lxc/tools: set default log_priority to ERROR

For some reason, we don't have default log_priority
set for many tools which leads to the situation when
tools can fail silently even if error occurs.

Fixes: #4405
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agotools/lxc_autostart: don't fail when there are no containers 4420/head
Alexander Mikhalitsyn [Tue, 2 Apr 2024 11:43:08 +0000 (13:43 +0200)] 
tools/lxc_autostart: don't fail when there are no containers

Fixes: #3847
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agolxc/lxccontainer: specify file mode in open() call inside mod_rdep 4419/head
Alexander Mikhalitsyn [Tue, 2 Apr 2024 10:55:19 +0000 (12:55 +0200)] 
lxc/lxccontainer: specify file mode in open() call inside mod_rdep

We must explicitly specify file mode in open(.. O_CREAT ..).

Let's set 0644, while previously it was 0666 [1] which seems too much.

[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=libio/fileops.c;h=4db4a76f755b1f3b766dc47c669c09242395ec95;hb=HEAD#l216

Fixes: Coverity 1596044
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agolxc/confile: do not print excess space before scale suffix for time.offset.boot 4418/head
Alexander Mikhalitsyn [Tue, 2 Apr 2024 10:14:38 +0000 (12:14 +0200)] 
lxc/confile: do not print excess space before scale suffix for time.offset.boot

Let's make time.offset.boot and time.offset.monotonic getters consistent

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agolxc/confile: do not print newline symbol in getter for lxc.time.offset.*
Alexander Mikhalitsyn [Tue, 2 Apr 2024 09:46:29 +0000 (11:46 +0200)] 
lxc/confile: do not print newline symbol in getter for lxc.time.offset.*

It's clearly a mistake in the getters implementation.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agotests/parse_config_file: fix some typos
Alexander Mikhalitsyn [Tue, 2 Apr 2024 09:14:18 +0000 (11:14 +0200)] 
tests/parse_config_file: fix some typos

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agotests/parse_config_file: add tests for lxc.time.offset.*
Alexander Mikhalitsyn [Tue, 2 Apr 2024 09:13:21 +0000 (11:13 +0200)] 
tests/parse_config_file: add tests for lxc.time.offset.*

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agotree-wide: replace multiply_overflow with check_mul_overflow
Arnaud Fontaine [Tue, 2 Apr 2024 08:49:34 +0000 (10:49 +0200)] 
tree-wide: replace multiply_overflow with check_mul_overflow

Remove redundant multiply_overflow helper and use check_mul_overflow.

This also fixes a bug with incorrect handling for negative offset values.

Link: #4374

Signed-off-by: Arnaud Fontaine <arnaud.fontaine@airbus.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agoMerge pull request #4417 from mihalicyn/revert-3951-2021-08-25.fixes
Stéphane Graber [Mon, 1 Apr 2024 21:16:55 +0000 (17:16 -0400)] 
Merge pull request #4417 from mihalicyn/revert-3951-2021-08-25.fixes

Rework "lxccontainer: fixes" PR

18 months agolxccontainer: rework copy_file() 4417/head
Christian Brauner [Wed, 25 Aug 2021 14:11:55 +0000 (16:11 +0200)] 
lxccontainer: rework copy_file()

Signed-off-by: Christian Brauner <christian@brauner.io>
resurrect file_exists(new) check
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agolxccontainer: improve mod_rdep()
Christian Brauner [Wed, 25 Aug 2021 14:05:00 +0000 (16:05 +0200)] 
lxccontainer: improve mod_rdep()

Signed-off-by: Christian Brauner <christian@brauner.io>
O_RDWR -> O_WRONLY | O_CREAT
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agoRevert "lxccontainer: fixes"
Alexander Mikhalitsyn [Mon, 1 Apr 2024 15:23:48 +0000 (17:23 +0200)] 
Revert "lxccontainer: fixes"

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
18 months agoMerge pull request #3951 from brauner/2021-08-25.fixes
Stéphane Graber [Mon, 1 Apr 2024 13:21:05 +0000 (09:21 -0400)] 
Merge pull request #3951 from brauner/2021-08-25.fixes

lxccontainer: fixes

18 months agoMerge pull request #4416 from ffontaine/main
Stéphane Graber [Sun, 31 Mar 2024 01:13:21 +0000 (21:13 -0400)] 
Merge pull request #4416 from ffontaine/main

src/lxc/syscall_numbers.h: drop define -1

18 months agosrc/lxc/syscall_numbers.h: drop define -1 4416/head
Fabrice Fontaine [Sat, 30 Mar 2024 15:50:46 +0000 (16:50 +0100)] 
src/lxc/syscall_numbers.h: drop define -1

Drop "#define -1" to avoid the following m68k build failure with gcc 12:

In file included from ../src/lxc/syscall_wrappers.h:19,
                 from ../src/lxc/mount_utils.h:15,
                 from ../src/lxc/conf.h:24,
                 from ../src/lxc/log.h:19,
                 from ../src/lxc/storage/btrfs.c:20:
../src/lxc/syscall_numbers.h:423:25: error: macro names must be identifiers
  423 |                 #define -1
      |                         ^

Fixes:
 - http://autobuild.buildroot.org/results/f40a517eba86838b11b4b1d6a8a05b8233a3394d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
18 months agoMerge pull request #4346 from zhongTao99/fix
Stéphane Graber [Tue, 26 Mar 2024 14:37:20 +0000 (10:37 -0400)] 
Merge pull request #4346 from zhongTao99/fix

containers in the FREEZING state also need to be unfreeze

18 months agoMerge pull request #4412 from petris/fix_rexec_free
Serge Hallyn [Sat, 23 Mar 2024 01:34:50 +0000 (20:34 -0500)] 
Merge pull request #4412 from petris/fix_rexec_free

rexec: Avoid invalid free in rexec failure path

18 months agorexec: Avoid invalid free in rexec failure path 4412/head
Petr Malat [Tue, 12 Mar 2024 12:28:29 +0000 (13:28 +0100)] 
rexec: Avoid invalid free in rexec failure path

Commit "rexec: free argv array on failure" used __do_free_string_list
as a destructor for argv, which is an array of pointers to a single
buffer and not an array of pointers to independent buffers, which leads
to an attempt to free invalid pointer whenever argv has more than one
element.

Structure argv as one memory block and use __do_free as the destructor.

Signed-off-by: Petr Malat <oss@malat.biz>
18 months agoMerge pull request #4414 from cjavad/main
Stéphane Graber [Mon, 18 Mar 2024 07:28:38 +0000 (03:28 -0400)] 
Merge pull request #4414 from cjavad/main

README: Correct 'armvl7' to 'armv7l'

18 months agoREADME: Correct 'armvl7' to 'armv7l' 4414/head
Javad Shafique [Sun, 17 Mar 2024 21:18:35 +0000 (22:18 +0100)] 
README: Correct 'armvl7' to 'armv7l'

Use the correct designation for the armv7l arch, as also reflected in src/lxc/confile.c.

Signed-off-by: Javad Shafique <javadshafique@hotmail.com>
18 months agoMerge pull request #4411 from hallyn/2024-03-11/simplify-lookup_name
Stéphane Graber [Mon, 11 Mar 2024 23:37:09 +0000 (19:37 -0400)] 
Merge pull request #4411 from hallyn/2024-03-11/simplify-lookup_name

unshare: simplify lookup_name

18 months agounshare: simplify lookup_name 4411/head
Serge Hallyn [Mon, 11 Mar 2024 20:41:05 +0000 (15:41 -0500)] 
unshare: simplify lookup_name

pass the optarg straight to getpwnam_r, instead of first
scanning the name out of it.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
18 months agoMerge pull request #4410 from HappyDrink-okk/main
Stéphane Graber [Mon, 11 Mar 2024 19:42:22 +0000 (15:42 -0400)] 
Merge pull request #4410 from HappyDrink-okk/main

lxc-unshare: fix an buffer overflow issue in lxc_unshare

18 months agolxc-unshare: fix an buffer overflow issue in lxc_unshare 4410/head
HappyDrink-okk [Sun, 10 Mar 2024 07:45:34 +0000 (15:45 +0800)] 
lxc-unshare: fix an buffer overflow issue in lxc_unshare

If the input parameter length is greater than PATH_MAX, a buffer overflow will occur.

Signed-off-by: HappyDrink-okk <liu7529@yeah.net>
19 months agoMerge pull request #4397 from PoneyClairDeLune/patch-1
Stéphane Graber [Fri, 23 Feb 2024 23:11:49 +0000 (18:11 -0500)] 
Merge pull request #4397 from PoneyClairDeLune/patch-1

Assign IPv6 address and enable IPv6 NAT by default

19 months agolxc-net: Enable IPv6 by default 4397/head
Lumière Élevé [Thu, 8 Feb 2024 17:16:32 +0000 (17:16 +0000)] 
lxc-net: Enable IPv6 by default

Signed-off-by: Lumière Élevé <88174309+PoneyClairDeLune@users.noreply.github.com>
19 months agoMerge pull request #4403 from mihalicyn/meson_fixup_1
Christian Brauner [Mon, 19 Feb 2024 12:38:08 +0000 (13:38 +0100)] 
Merge pull request #4403 from mihalicyn/meson_fixup_1

github: master -> main & ossfuzz build fixes

19 months agotests/meson: attempt to fix ossfuzz builds 4403/head
Alexander Mikhalitsyn [Mon, 19 Feb 2024 09:05:43 +0000 (10:05 +0100)] 
tests/meson: attempt to fix ossfuzz builds

As we link statically with liblxc, we don't need to
link with liblxc_ext_sources, as all the symbols will come
from liblxc.a itself.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agogithub: master -> main
Alexander Mikhalitsyn [Mon, 19 Feb 2024 08:56:04 +0000 (09:56 +0100)] 
github: master -> main

Our main branch is "main" for some time, but
in github scripts we still use "master" which is incorrect
and prevent some stuff from working.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoMerge pull request #4401 from mihalicyn/meson_link_dynamically_fix
Christian Brauner [Sun, 18 Feb 2024 22:07:56 +0000 (23:07 +0100)] 
Merge pull request #4401 from mihalicyn/meson_link_dynamically_fix

[RFC] meson: link dynamically

19 months agomeson: link with liblxc dynamically everywhere if possible 4401/head
Alexander Mikhalitsyn [Sun, 18 Feb 2024 16:12:49 +0000 (17:12 +0100)] 
meson: link with liblxc dynamically everywhere if possible

Link tests/tools/commands dynamically with liblxc if possible.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agonetwork: use IN_LIBLXC
Alexander Mikhalitsyn [Sun, 18 Feb 2024 16:05:10 +0000 (17:05 +0100)] 
network: use IN_LIBLXC

Put a bunch of functions under #if IN_LIBLXC to compile-out
them when network.c is linked with tools/tests code.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agostorage_utils: move get_fssize to utils
Alexander Mikhalitsyn [Sun, 18 Feb 2024 15:04:54 +0000 (16:04 +0100)] 
storage_utils: move get_fssize to utils

This helper is used in the lxc/tools and it's
fully independent of storage_utils code, let's move it
to utils.c

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agostorage_utils: unhide and rename is_valid_storage_type to lxc_is_valid_storage_type
Alexander Mikhalitsyn [Sun, 18 Feb 2024 14:56:47 +0000 (15:56 +0100)] 
storage_utils: unhide and rename is_valid_storage_type to lxc_is_valid_storage_type

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoconfile: unhide lxc_config_parse_arch() helper
Alexander Mikhalitsyn [Sun, 18 Feb 2024 14:43:20 +0000 (15:43 +0100)] 
confile: unhide lxc_config_parse_arch() helper

Looks safe enough to be available for liblxc users.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoconf: reorganize/split code to utils.c
Alexander Mikhalitsyn [Sun, 18 Feb 2024 14:24:29 +0000 (15:24 +0100)] 
conf: reorganize/split code to utils.c

Move run_script/run_script_argv helpers to utils.c

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoconf: reorganize/split code to idmap_utils.c
Alexander Mikhalitsyn [Sun, 18 Feb 2024 14:17:25 +0000 (15:17 +0100)] 
conf: reorganize/split code to idmap_utils.c

Move some idmaps-related functions from lxc/conf.c
to a new idmap_utils.c file.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoconfile: unhide lxc_config_define*() helpers
Alexander Mikhalitsyn [Sat, 17 Feb 2024 15:58:02 +0000 (16:58 +0100)] 
confile: unhide lxc_config_define*() helpers

Let's unhide lxc_config_define_add, lxc_config_define_load and
lxc_config_define_free helpers. These functions are safe enough
to be used by external tools. Semantic is also clear.

Reason is that we have lxc-start/lxc-execute tools which
use these symbols. Right now it works, because we just
link a whole liblxc statically to each lxc-* tool...

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agomeson: introduce IN_LIBLXC preprocessor macro
Alexander Mikhalitsyn [Sat, 17 Feb 2024 15:47:41 +0000 (16:47 +0100)] 
meson: introduce IN_LIBLXC preprocessor macro

The purpose of it is to tell us if we are compiling
liblxc or lxc test/tool/command.

This thing is needed to exclude unnecessary functions
from being compiled-in in the resulting executables
like lxc-start, lxc-attach, etc.

The problem is that lxc tools (lxc-start, lxc-stop, etc)
depend not only on the liblxc as a shared library, but also
require some non-exported symbols or helpers from liblxc
internals. So, we have to link these executables with some liblxc
object files directly which results in the dependency hell,
because linking one .c file from liblxc may end up having to
link with another one (what contains some dependency) and so on.
By using IN_LIBLXC in the liblxc internals we can selectively
omit some functions from being compiled in such cases.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoconfile: move lxc_fill_elevated_privileges() to tools/lxc_attach
Alexander Mikhalitsyn [Sat, 17 Feb 2024 15:43:21 +0000 (16:43 +0100)] 
confile: move lxc_fill_elevated_privileges() to tools/lxc_attach

lxc_fill_elevated_privileges() is used only in lxc-attach tool,
let's move this function in there.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
19 months agoMerge pull request #4395 from tsnaik/mount-check
Stéphane Graber [Fri, 16 Feb 2024 04:01:44 +0000 (23:01 -0500)] 
Merge pull request #4395 from tsnaik/mount-check

oci: resolve cross-filesystem blob caching failure

19 months agoMerge pull request #4398 from mihalicyn/usernic_fixes_2
Christian Brauner [Thu, 15 Feb 2024 17:50:37 +0000 (18:50 +0100)] 
Merge pull request #4398 from mihalicyn/usernic_fixes_2

tests: lxc-test-usernic: use iproute tool instead of brctl

19 months agoMerge pull request #4399 from mihalicyn/apparmor_lxc_copy
Christian Brauner [Thu, 15 Feb 2024 17:50:19 +0000 (18:50 +0100)] 
Merge pull request #4399 from mihalicyn/apparmor_lxc_copy

config: apparmor: add AppArmor profile for lxc-copy

19 months agoMerge pull request #4400 from mihalicyn/remove_old_cgroup_handling_in_tests
Christian Brauner [Thu, 15 Feb 2024 17:50:06 +0000 (18:50 +0100)] 
Merge pull request #4400 from mihalicyn/remove_old_cgroup_handling_in_tests

tests: remove old and broken cgroup handling code from tests