]> git.proxmox.com Git - mirror_lxc.git/log
mirror_lxc.git
5 years agocommands_utils.c: fix wrong licensing
Christian Brauner [Sun, 3 Mar 2019 13:11:55 +0000 (14:11 +0100)]
commands_utils.c: fix wrong licensing

liblxc has always been meant to be LGPLv2.1+ as reflected by the many
downstreams projects and bindings which are themselves under LGPLv2.1+ or other
licenses which would be incompatible with linking against a GPLv2+ library.

It's pretty normal for a library to be LGPL while binaries are GPL as a GPL
library would only ever be usable by other GPL-only projects, which isn't the
case for very many of the liblxc downstreams.

The issue here is really carelessness. None of those GPL headers were put there
intentionally, instead being wrongly copy/pasted from other parts of the
codebase which is indeed intended to be GPLv2+. This is also made clear in our
CONTRIBUTING file in this repository:

Licensing for new files:
------------------------

LXC is made of files shipped under a few different licenses.

Anything that ends up being part of the LXC library needs to be released
under LGPLv2.1+ or a license compatible with it (though the latter will
only be accepted for cases where the code originated elsewhere and was
imported into LXC).

Language bindings for the libraries need to be released under LGPLv2.1+.

Anything else (non-libraries) needs to be Free Software and needs to be
allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers
LGPLv2.1+ or GPLv2 for those.

When introducing a new file into the project, please make sure it has a
copyright header making clear under which license it's being released
and if it doesn't match the criteria described above, please explain
your decision on the lxc-devel mailing-list when submitting your patch.

This is intended to switch over files to LGPLv2.1+ to which end we have
collected ACKs from relevant people.
/* Affected People */
Christian Brauner <christian.brauner@ubuntu.com>
Donghwa Jeong <dh48.jeong@samsung.com>

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Acked-by: Donghwa Jeong <dh48.jeong@samsung.com>
5 years agoMerge pull request #2887 from brauner/2019-03-01/coding_style_updates
Stéphane Graber [Sat, 2 Mar 2019 10:27:19 +0000 (11:27 +0100)]
Merge pull request #2887 from brauner/2019-03-01/coding_style_updates

CODING_STYLE: update

5 years agoMerge pull request #2886 from brauner/2019-03-01/bugfixes
Stéphane Graber [Sat, 2 Mar 2019 10:26:54 +0000 (11:26 +0100)]
Merge pull request #2886 from brauner/2019-03-01/bugfixes

minor fixes

5 years agoMerge pull request #2888 from kubiko/fix-android-compile
Christian Brauner [Fri, 1 Mar 2019 23:41:00 +0000 (00:41 +0100)]
Merge pull request #2888 from kubiko/fix-android-compile

Fix android compilation

5 years agoFix android compilation
Ondrej Kubik [Thu, 21 Feb 2019 14:59:21 +0000 (16:59 +0200)]
Fix android compilation

Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
5 years agoCODING_STYLE: update
Christian Brauner [Fri, 1 Mar 2019 20:24:31 +0000 (21:24 +0100)]
CODING_STYLE: update

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconfile: shut up gcc
Christian Brauner [Fri, 1 Mar 2019 20:15:49 +0000 (21:15 +0100)]
confile: shut up gcc

Invalid warning but let's please the compiler.

Closes #2885.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: remove unused variable
Christian Brauner [Fri, 1 Mar 2019 20:15:20 +0000 (21:15 +0100)]
conf: remove unused variable

Closes #2885.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2882 from misterunknown/master
Stéphane Graber [Thu, 28 Feb 2019 09:34:13 +0000 (10:34 +0100)]
Merge pull request #2882 from misterunknown/master

gpg: use proxy, if http_proxy is set

5 years agogpg: use proxy, if http_proxy is set
Marco Dickert [Thu, 28 Feb 2019 09:03:16 +0000 (10:03 +0100)]
gpg: use proxy, if http_proxy is set

Signed-off-by: Marco Dickert <marco@misterunknown.de>
5 years agoMerge pull request #2881 from Blub/2019-02-25/lxc-attach-move_fd
Christian Brauner [Mon, 25 Feb 2019 16:19:15 +0000 (17:19 +0100)]
Merge pull request #2881 from Blub/2019-02-25/lxc-attach-move_fd

attach: use move_fd in lxc_proc_close_ns_fd

5 years agoattach: use move_fd in lxc_proc_close_ns_fd
Wolfgang Bumiller [Mon, 25 Feb 2019 16:05:24 +0000 (17:05 +0100)]
attach: use move_fd in lxc_proc_close_ns_fd

Previously this set `ctx->ns_fd[*]` to `-EBADF` until commit
fd2a88b190eb ("attach: cleanup macros lxc_proc_close_ns_fd",
but there are some code paths where we call this before
later calling `lxc_proc_put_context_info` which would call
this function again with the file descriptors still
unchanged.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
5 years agoMerge pull request #2880 from brauner/2019-02-22/cleanup_macros
Stéphane Graber [Sat, 23 Feb 2019 22:07:31 +0000 (17:07 -0500)]
Merge pull request #2880 from brauner/2019-02-22/cleanup_macros

tree-wide: cleanup macros

5 years agoconf: cleanup macros suggest_default_idmap
Christian Brauner [Fri, 22 Feb 2019 21:15:09 +0000 (22:15 +0100)]
conf: cleanup macros suggest_default_idmap

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros write_id_mapping
Christian Brauner [Fri, 22 Feb 2019 21:12:20 +0000 (22:12 +0100)]
conf: cleanup macros write_id_mapping

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros setup_mount_entries
Christian Brauner [Fri, 22 Feb 2019 21:07:26 +0000 (22:07 +0100)]
conf: cleanup macros setup_mount_entries

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros make_anonymous_mount_file
Christian Brauner [Fri, 22 Feb 2019 21:06:47 +0000 (22:06 +0100)]
conf: cleanup macros make_anonymous_mount_file

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_fill_autodev
Christian Brauner [Fri, 22 Feb 2019 21:04:14 +0000 (22:04 +0100)]
conf: cleanup macros lxc_fill_autodev

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_pivot_root
Christian Brauner [Fri, 22 Feb 2019 20:59:57 +0000 (21:59 +0100)]
conf: cleanup macros lxc_pivot_root

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_chroot
Christian Brauner [Fri, 22 Feb 2019 20:56:55 +0000 (21:56 +0100)]
conf: cleanup macros lxc_chroot

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros remount_all_slave
Christian Brauner [Fri, 22 Feb 2019 20:49:48 +0000 (21:49 +0100)]
conf: cleanup macros remount_all_slave

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: simplify idmaptool_on_path_and_privileged
Christian Brauner [Fri, 22 Feb 2019 20:41:41 +0000 (21:41 +0100)]
conf: simplify idmaptool_on_path_and_privileged

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2867 from brauner/2019-02-19/cleanup_macros
Stéphane Graber [Fri, 22 Feb 2019 20:28:15 +0000 (15:28 -0500)]
Merge pull request #2867 from brauner/2019-02-19/cleanup_macros

tree-wide: cleanup macros

5 years agoMerge pull request #2879 from brauner/2019-02-21/attach_run_wait
Stéphane Graber [Thu, 21 Feb 2019 19:50:51 +0000 (11:50 -0800)]
Merge pull request #2879 from brauner/2019-02-21/attach_run_wait

lxc-attach: switch to attach_run_wait

5 years agolxc-attach: switch to attach_run_wait
Christian Brauner [Thu, 21 Feb 2019 19:28:24 +0000 (20:28 +0100)]
lxc-attach: switch to attach_run_wait

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years ago.travis: remove coverity
Christian Brauner [Thu, 21 Feb 2019 09:56:13 +0000 (10:56 +0100)]
.travis: remove coverity

It hasn't worked reliably for us for a long time. Remove it until such time as
someone cares enough to fix it.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years ago.travis: give coverity one more try
Christian Brauner [Thu, 21 Feb 2019 09:47:13 +0000 (10:47 +0100)]
.travis: give coverity one more try

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: cleanup macros lxc_attach_terminal_[...]
Christian Brauner [Wed, 20 Feb 2019 23:35:52 +0000 (00:35 +0100)]
attach: cleanup macros lxc_attach_terminal_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: cleanup macros lxc_put_attach_clone_[...]
Christian Brauner [Wed, 20 Feb 2019 23:21:57 +0000 (00:21 +0100)]
attach: cleanup macros lxc_put_attach_clone_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: cleanup macros in_same_namespace
Christian Brauner [Wed, 20 Feb 2019 23:18:59 +0000 (00:18 +0100)]
attach: cleanup macros in_same_namespace

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: cleanup macros lxc_proc_close_ns_fd
Christian Brauner [Wed, 20 Feb 2019 23:12:15 +0000 (00:12 +0100)]
attach: cleanup macros lxc_proc_close_ns_fd

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2876 from brauner/2019-02-20/run_coccinelle_during_tests
Stéphane Graber [Wed, 20 Feb 2019 20:33:58 +0000 (12:33 -0800)]
Merge pull request #2876 from brauner/2019-02-20/run_coccinelle_during_tests

travis: run coccinelle

5 years agotravis: run coccinelle
Christian Brauner [Wed, 20 Feb 2019 20:11:46 +0000 (21:11 +0100)]
travis: run coccinelle

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2875 from brauner/2019-02-20/run_coccinelle_during_tests
Stéphane Graber [Wed, 20 Feb 2019 20:04:08 +0000 (12:04 -0800)]
Merge pull request #2875 from brauner/2019-02-20/run_coccinelle_during_tests

tests: run coccinelle checks

5 years agotravis: run coccinelle
Christian Brauner [Wed, 20 Feb 2019 19:44:16 +0000 (20:44 +0100)]
travis: run coccinelle

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2874 from stgraber/master
Christian Brauner [Wed, 20 Feb 2019 19:06:08 +0000 (20:06 +0100)]
Merge pull request #2874 from stgraber/master

Fix existing mount target check

5 years agoFix existing mount target check
Stéphane Graber [Wed, 20 Feb 2019 18:55:09 +0000 (10:55 -0800)]
Fix existing mount target check

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
5 years agoconf: cleanup macros suggest_default_idmap
Christian Brauner [Tue, 19 Feb 2019 22:49:14 +0000 (23:49 +0100)]
conf: cleanup macros suggest_default_idmap

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros get{g,u}name
Christian Brauner [Tue, 19 Feb 2019 22:48:06 +0000 (23:48 +0100)]
conf: cleanup macros get{g,u}name

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros get_minimal_idmap
Christian Brauner [Tue, 19 Feb 2019 22:47:49 +0000 (23:47 +0100)]
conf: cleanup macros get_minimal_idmap

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_execute_bind_init
Christian Brauner [Tue, 19 Feb 2019 22:47:26 +0000 (23:47 +0100)]
conf: cleanup macros lxc_execute_bind_init

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros remount_all_slave
Christian Brauner [Tue, 19 Feb 2019 22:47:05 +0000 (23:47 +0100)]
conf: cleanup macros remount_all_slave

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros idmaptool_on_path_[...]
Christian Brauner [Tue, 19 Feb 2019 22:46:34 +0000 (23:46 +0100)]
conf: cleanup macros idmaptool_on_path_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros setup_proc_filesystem
Christian Brauner [Tue, 19 Feb 2019 22:46:11 +0000 (23:46 +0100)]
conf: cleanup macros setup_proc_filesystem

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros setup_sysctl_parameters
Christian Brauner [Tue, 19 Feb 2019 22:45:43 +0000 (23:45 +0100)]
conf: cleanup macros setup_sysctl_parameters

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros mount_entry_on_generic
Christian Brauner [Tue, 19 Feb 2019 22:45:24 +0000 (23:45 +0100)]
conf: cleanup macros mount_entry_on_generic

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros mount_entry_create_dir_file
Christian Brauner [Tue, 19 Feb 2019 22:45:03 +0000 (23:45 +0100)]
conf: cleanup macros mount_entry_create_dir_file

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros parse_propagationopts
Christian Brauner [Tue, 19 Feb 2019 22:44:08 +0000 (23:44 +0100)]
conf: cleanup macros parse_propagationopts

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros parse_mntopts
Christian Brauner [Tue, 19 Feb 2019 22:43:45 +0000 (23:43 +0100)]
conf: cleanup macros parse_mntopts

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_chroot
Christian Brauner [Tue, 19 Feb 2019 22:43:27 +0000 (23:43 +0100)]
conf: cleanup macros lxc_chroot

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_mount_auto_mounts
Christian Brauner [Tue, 19 Feb 2019 22:43:04 +0000 (23:43 +0100)]
conf: cleanup macros lxc_mount_auto_mounts

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros pin_rootfs
Christian Brauner [Tue, 19 Feb 2019 22:42:45 +0000 (23:42 +0100)]
conf: cleanup macros pin_rootfs

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros run_script_argv
Christian Brauner [Tue, 19 Feb 2019 22:42:25 +0000 (23:42 +0100)]
conf: cleanup macros run_script_argv

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: auto free run_buffer
Christian Brauner [Tue, 19 Feb 2019 22:41:48 +0000 (23:41 +0100)]
conf: auto free run_buffer

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands_utils: auto free lxc_add_state_client
Christian Brauner [Tue, 19 Feb 2019 22:21:50 +0000 (23:21 +0100)]
commands_utils: auto free lxc_add_state_client

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands_utils: auto close lxc_cmd_sock_get_state
Christian Brauner [Tue, 19 Feb 2019 22:21:08 +0000 (23:21 +0100)]
commands_utils: auto close lxc_cmd_sock_get_state

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2866 from brauner/2019-02-19/cve-2019-5736-test
Christian Brauner [Tue, 19 Feb 2019 20:58:04 +0000 (21:58 +0100)]
Merge pull request #2866 from brauner/2019-02-19/cve-2019-5736-test

cve-2019-5736: add test

5 years agocve-2019-5736: add test
Christian Brauner [Tue, 19 Feb 2019 17:19:18 +0000 (18:19 +0100)]
cve-2019-5736: add test

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2865 from brauner/2019-02-18/rexec_improve_fallbacks
Stéphane Graber [Mon, 18 Feb 2019 22:24:08 +0000 (17:24 -0500)]
Merge pull request #2865 from brauner/2019-02-18/rexec_improve_fallbacks

rexec: try sendfile() fallback to fd_to_fd()

5 years agorexec: try sendfile() fallback to fd_to_fd()
Christian Brauner [Mon, 18 Feb 2019 22:01:43 +0000 (23:01 +0100)]
rexec: try sendfile() fallback to fd_to_fd()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2864 from brauner/2019-02-18/rename_pointer_macros
Stéphane Graber [Mon, 18 Feb 2019 21:36:14 +0000 (16:36 -0500)]
Merge pull request #2864 from brauner/2019-02-18/rename_pointer_macros

tree-wide: s/steal_{fd,ptr}/move_{fd,ptr}/g

5 years agotree-wide: s/steal_fd/move_fd/g
Christian Brauner [Mon, 18 Feb 2019 21:13:42 +0000 (22:13 +0100)]
tree-wide: s/steal_fd/move_fd/g

Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agotree-wide: s/steal_ptr/move_ptr/g
Christian Brauner [Mon, 18 Feb 2019 21:12:29 +0000 (22:12 +0100)]
tree-wide: s/steal_ptr/move_ptr/g

Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2863 from brauner/2019-02-17/save_rexec
Stéphane Graber [Mon, 18 Feb 2019 20:35:01 +0000 (15:35 -0500)]
Merge pull request #2863 from brauner/2019-02-17/save_rexec

rexec: handle legacy kernels

5 years ago[V2] rexec: handle legacy kernels
Christian Brauner [Mon, 18 Feb 2019 12:32:26 +0000 (13:32 +0100)]
[V2] rexec: handle legacy kernels

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoRevert "rexec: handle legacy kernels"
Stéphane Graber [Mon, 18 Feb 2019 17:15:30 +0000 (12:15 -0500)]
Revert "rexec: handle legacy kernels"

Broke Android

This reverts commit 8f350e637c0e8001398602a6b2f536de3905787d.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
5 years agoMerge pull request #2862 from brauner/2019-02-17/save_rexec
Stéphane Graber [Mon, 18 Feb 2019 16:56:44 +0000 (11:56 -0500)]
Merge pull request #2862 from brauner/2019-02-17/save_rexec

cleanup macros and rexec fixes

5 years agorexec: use __do_close_prot_errno
Christian Brauner [Sun, 17 Feb 2019 14:12:19 +0000 (15:12 +0100)]
rexec: use __do_close_prot_errno

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agorexec: handle legacy kernels
Christian Brauner [Mon, 18 Feb 2019 12:32:26 +0000 (13:32 +0100)]
rexec: handle legacy kernels

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: cleanup macros lxc_cmd_init()
Christian Brauner [Sun, 17 Feb 2019 13:46:25 +0000 (14:46 +0100)]
commands: cleanup macros lxc_cmd_init()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: cleanup macros lxc_cmd_init
Christian Brauner [Sun, 17 Feb 2019 13:44:20 +0000 (14:44 +0100)]
commands: cleanup macros lxc_cmd_init

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: cleanup macros lxc_cmd_accept()
Christian Brauner [Sun, 17 Feb 2019 13:42:51 +0000 (14:42 +0100)]
commands: cleanup macros lxc_cmd_accept()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: cleanup macros lxc_cmd_add_state_client
Christian Brauner [Sun, 17 Feb 2019 13:39:55 +0000 (14:39 +0100)]
commands: cleanup macros lxc_cmd_add_state_client

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: cleanup macros lxc_cmd()
Christian Brauner [Sun, 17 Feb 2019 13:36:52 +0000 (14:36 +0100)]
commands: cleanup macros lxc_cmd()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: use __do_close_prot_errno
Christian Brauner [Sun, 17 Feb 2019 13:32:14 +0000 (14:32 +0100)]
commands: use __do_close_prot_errno

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agomemory_utils: introduce __do_close_prot_errno
Christian Brauner [Sun, 17 Feb 2019 13:31:52 +0000 (14:31 +0100)]
memory_utils: introduce __do_close_prot_errno

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agomacro: introduce steal_fd()
Christian Brauner [Sun, 17 Feb 2019 13:31:40 +0000 (14:31 +0100)]
macro: introduce steal_fd()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: cleanup macros in lxc_cmd_console()
Christian Brauner [Sun, 17 Feb 2019 13:24:30 +0000 (14:24 +0100)]
commands: cleanup macros in lxc_cmd_console()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocommands: move declaration into tighter scope
Christian Brauner [Sun, 17 Feb 2019 13:21:09 +0000 (14:21 +0100)]
commands: move declaration into tighter scope

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agolxc-usernsexec: use cleanup macros
Christian Brauner [Sat, 9 Feb 2019 11:05:46 +0000 (12:05 +0100)]
lxc-usernsexec: use cleanup macros

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agolxc-user-nic: use cleanup macros
Christian Brauner [Sat, 9 Feb 2019 11:02:22 +0000 (12:02 +0100)]
lxc-user-nic: use cleanup macros

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agolxc-init: use cleanup macros
Christian Brauner [Sat, 9 Feb 2019 10:57:07 +0000 (11:57 +0100)]
lxc-init: use cleanup macros

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocgroup_utils: use __do_free
Christian Brauner [Sat, 9 Feb 2019 10:51:04 +0000 (11:51 +0100)]
cgroup_utils: use __do_free

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: use __do_free
Christian Brauner [Sat, 9 Feb 2019 10:46:15 +0000 (11:46 +0100)]
attach: use __do_free

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoaf_unix: use __do_free
Christian Brauner [Sat, 9 Feb 2019 10:36:18 +0000 (11:36 +0100)]
af_unix: use __do_free

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agostart: move variable into tighter scope
Christian Brauner [Sat, 9 Feb 2019 10:32:45 +0000 (11:32 +0100)]
start: move variable into tighter scope

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2860 from stgraber/master
Christian Brauner [Sat, 16 Feb 2019 01:18:23 +0000 (02:18 +0100)]
Merge pull request #2860 from stgraber/master

mount: Allow over-mounting

5 years agomount: Cleanup allow over-mounting
Stéphane Graber [Sat, 16 Feb 2019 01:02:07 +0000 (20:02 -0500)]
mount: Cleanup allow over-mounting

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
5 years agoMerge pull request #2859 from stgraber/master
Christian Brauner [Sat, 16 Feb 2019 01:07:47 +0000 (02:07 +0100)]
Merge pull request #2859 from stgraber/master

mount: Allow over-mounting

5 years agomount: Allow over-mounting
Stéphane Graber [Sat, 16 Feb 2019 01:02:07 +0000 (20:02 -0500)]
mount: Allow over-mounting

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
5 years agoMerge pull request #2857 from brauner/2019-02-15/tweak_log
Stéphane Graber [Fri, 15 Feb 2019 23:21:33 +0000 (18:21 -0500)]
Merge pull request #2857 from brauner/2019-02-15/tweak_log

log: fixes

5 years agonetwork: do not log false friends
Christian Brauner [Fri, 15 Feb 2019 22:50:34 +0000 (23:50 +0100)]
network: do not log false friends

The netlink functions just return -1 and not specific negative errno values so
logging them doesn't make any sense.

Fixes: https://discuss.linuxcontainers.org/t/warning-in-the-container-log/4072/2
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: do not log devpts umount2() failure
Christian Brauner [Fri, 15 Feb 2019 22:42:30 +0000 (23:42 +0100)]
conf: do not log devpts umount2() failure

We're not acting based on the return value so don't log anything.

Fixes: https://discuss.linuxcontainers.org/t/warning-in-the-container-log/4072/2
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2852 from brauner/2019-02-14/revert_simplify_argv_parsing
Stéphane Graber [Thu, 14 Feb 2019 15:58:09 +0000 (10:58 -0500)]
Merge pull request #2852 from brauner/2019-02-14/revert_simplify_argv_parsing

rexec: cmdline and environ parsing improvements

5 years agorexec: remove envp parsing in favour of environ
Christian Brauner [Thu, 14 Feb 2019 13:48:41 +0000 (14:48 +0100)]
rexec: remove envp parsing in favour of environ

My first attempt to simplify this and make it less costly focussed on
the way constructors are called. I was under the impression that the ELF
specification mandated that arg, argv, and actually even envp need to be
passed to functions located in the .init_array section (aka
"constructors"). Actually, the specifications is (cf. [2]):

SHT_INIT_ARRAY
This section contains an array of pointers to initialization functions,
as described in ``Initialization and Termination Functions'' in Chapter
5. Each pointer in the array is taken as a parameterless procedure with
a void return.

which means that this becomes a libc specific decision. Glibc passes
down those args, musl doesn't. So this approach can't work. However, we
can at least remove the environment parsing part based on POSIX since
[1] mandates that there should be an environ variable defined in
unistd.h which provides access to the environment. See also the relevant
Open Group specification [1].

[1]: http://pubs.opengroup.org/onlinepubs/9699919799/
[2]: http://www.sco.com/developers/gabi/latest/ch4.sheader.html#init_array

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoRevert "rexec: remove needless /proc/cmdline parsing"
Christian Brauner [Thu, 14 Feb 2019 13:37:46 +0000 (14:37 +0100)]
Revert "rexec: remove needless /proc/cmdline parsing"

The ELF binary spec does specify in [1]:

SHT_INIT_ARRAY
This section contains an array of pointers to initialization functions,
as described in ``Initialization and Termination Functions'' in Chapter
5. Each pointer in the array is taken as a parameterless procedure with
a void return.

which means libcs other than glibc might not pass down argc and argv to
constructors.

This reverts commit 0c816b346788afa9d601766e31544fdcce67d780.

[1]: http://www.sco.com/developers/gabi/latest/ch4.sheader.html#init_array

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2850 from brauner/2019-02-13/simplify_argv_parsing
Stéphane Graber [Wed, 13 Feb 2019 22:25:05 +0000 (17:25 -0500)]
Merge pull request #2850 from brauner/2019-02-13/simplify_argv_parsing

rexec: remove needless /proc/cmdline parsing

5 years agorexec: remove needless /proc/cmdline parsing
Christian Brauner [Wed, 13 Feb 2019 22:08:11 +0000 (23:08 +0100)]
rexec: remove needless /proc/cmdline parsing

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2848 from 4383/improve-testing
Stéphane Graber [Tue, 12 Feb 2019 23:43:07 +0000 (18:43 -0500)]
Merge pull request #2848 from 4383/improve-testing

apparmore: Improve testing on apparmor python script

5 years agoapparmor: Improve testing on apparmor python script
Hervé Beraud [Tue, 12 Feb 2019 22:47:25 +0000 (23:47 +0100)]
apparmor: Improve testing on apparmor python script

Compare command output to already existing container-rules file

Signed-off-by: Hervé Beraud <hberaud@redhat.com>