]> git.ipfire.org Git - thirdparty/lxc.git/log
thirdparty/lxc.git
7 years agotests: remove invalid parts of short lived tests stable-2.1
Christian Brauner [Fri, 15 Dec 2017 13:33:46 +0000 (14:33 +0100)] 
tests: remove invalid parts of short lived tests

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agostart: stable-2.1 fixes
Christian Brauner [Fri, 15 Dec 2017 13:23:25 +0000 (14:23 +0100)] 
start: stable-2.1 fixes

- the reboot2() API extension doesn't exist so the command socket fd needs to
  be closed unconditionally
- fix bad cherry-pick that tried to take the lock on the state client list
  twice

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoutils: use lxc_raw_clone() in run_command()
Christian Brauner [Thu, 14 Dec 2017 15:42:00 +0000 (16:42 +0100)] 
utils: use lxc_raw_clone() in run_command()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agonamespace: add lxc_raw_clone()
Christian Brauner [Thu, 14 Dec 2017 14:31:54 +0000 (15:31 +0100)] 
namespace: add lxc_raw_clone()

This is based on raw_clone in systemd but adapted to our needs. The main reason
is that we need an implementation of fork()/clone() that does guarantee us that
no pthread_atfork() handlers are run. While clone() in glibc currently doesn't
run pthread_atfork() handlers we should be fine but there's no guarantee that
this won't be the case in the future. So let's do the syscall directly - or as
direct as we can. An additional nice feature is that we get fork() behavior,
i.e. lxc_raw_clone() returns 0 in the child and the child pid in the parent.

Our implementation tries to make sure that we cover all cases according to
kernel sources. Note that we are not interested in any arguments that could be
passed after the stack.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: fix race when open()/close() cmd socket
Christian Brauner [Thu, 14 Dec 2017 19:57:15 +0000 (20:57 +0100)] 
commands: fix race when open()/close() cmd socket

When we report STOPPED to a caller and then close the command socket it is
technically possible - and I've seen this happen on the test builders - that a
container start() right after a wait() will receive ECONNREFUSED because it
called open() before we close(). So for all new state clients simply close the
command socket. This will inform all state clients that the container is
STOPPED and also prevents a race between a open()/close() on the command socket
causing a new process to get ECONNREFUSED because we haven't yet closed the
command socket.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agodir_detect: warn on eperm
Serge Hallyn [Thu, 14 Dec 2017 19:16:02 +0000 (13:16 -0600)] 
dir_detect: warn on eperm

if user has lxc.rootfs.path = /some/path/foo, but can't access
some piece of that path, then we'll get an unhelpful "failed to
mount" without any indication of the problem.

At least show that there is a permission problem.

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
7 years agostart: fix cgroup namespace preservation
Christian Brauner [Tue, 12 Dec 2017 23:22:47 +0000 (00:22 +0100)] 
start: fix cgroup namespace preservation

Prior to this patch we raced with a very short-lived init process. Essentially,
the init process could exit before we had time to record the cgroup namespace
causing the container to abort and report ABORTING to the caller when it
actually started just fine. Let's not do this.

(This uses syscall(SYS_getpid) in the the child to retrieve the pid just in case
we're on an older glibc version and we end up in the namespace sharing branch
of the actual lxc_clone() call.)

Additionally this fixes the shortlived tests. They were faulty so far and
should have actually failed because of the cgroup namespace recording race but
the ret variable used to return from the function was not correctly
initialized. This fixes it.
Furthermore, the shortlived tests used the c->error_num variable to determine
success or failure but this is actually not correct when the container is
started daemonized.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agotools: exit success when lxc-execute is daemonized
Christian Brauner [Tue, 12 Dec 2017 20:05:39 +0000 (21:05 +0100)] 
tools: exit success when lxc-execute is daemonized

The error_num value doesn't tell us anything since the container hasn't exited.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agostart: do not unconditionally dup std{in,out,err}
Christian Brauner [Tue, 12 Dec 2017 19:09:06 +0000 (20:09 +0100)] 
start: do not unconditionally dup std{in,out,err}

Starting with commit

    commit c5b93afba1d79c6861a6f45db2943b6f3cfbdab4
    Author: Li Feng <lifeng68@huawei.com>
    Date:   Mon Jul 10 17:19:52 2017 +0800

        start: dup std{in,out,err} to pty slave

        In the case the container has a console with a valid slave pty file descriptor
        we duplicate std{in,out,err} to the slave file descriptor so console logging
        works correctly. When the container does not have a valid slave pty file
        descriptor for its console and is started daemonized we should dup to
        /dev/null.

        Closes #1646.

Signed-off-by: Li Feng <lifeng68@huawei.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
we made std{err,in,out} a duplicate of the slave file descriptor of the console
if it existed. This meant we also duplicated all of them when we executed
application containers in the foreground even if some std{err,in,out} file
descriptor did not refer to a {p,t}ty. This blocked use cases such as:

    echo foo | lxc-execute -n -- cat

which are very valid and common with application containers but less common
with system containers where we don't have to care about this. So my suggestion
is to unconditionally duplicate std{err,in,out} to the console file descriptor
if we are either running daemonized - this ensures that daemonized application
containers with a single bash shell keep on working - or when we are not
running an application container. In other cases we only duplicate those file
descriptors that actually refer to a {p,t}ty. This logic is similar to what we
do for lxc-attach already.

Refers to #1690.
Closes #2028.

Reported-by: Felix Abecassis <fabecassis@nvidia.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1426028
Christian Brauner [Sat, 9 Dec 2017 19:04:46 +0000 (20:04 +0100)] 
coverity: #1426028

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425857
Christian Brauner [Sat, 9 Dec 2017 19:00:40 +0000 (20:00 +0100)] 
coverity: #1425857

remove logically dead code

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425858
Christian Brauner [Sat, 9 Dec 2017 18:59:11 +0000 (19:59 +0100)] 
coverity: #1425858

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425859
Christian Brauner [Sat, 9 Dec 2017 18:53:43 +0000 (19:53 +0100)] 
coverity: #1425859

check return value of snprintf()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425860
Christian Brauner [Sat, 9 Dec 2017 18:51:55 +0000 (19:51 +0100)] 
coverity: #1425860

remove logically dead code

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425861
Christian Brauner [Sat, 9 Dec 2017 18:51:03 +0000 (19:51 +0100)] 
coverity: #1425861

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425862
Christian Brauner [Sat, 9 Dec 2017 18:48:48 +0000 (19:48 +0100)] 
coverity: #1425862

initialize handler

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425863
Christian Brauner [Sat, 9 Dec 2017 18:32:03 +0000 (19:32 +0100)] 
coverity: #1425863

remove logically dead code

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425866
Christian Brauner [Sat, 9 Dec 2017 18:26:52 +0000 (19:26 +0100)] 
coverity: #1425866

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425867
Christian Brauner [Sat, 9 Dec 2017 18:22:32 +0000 (19:22 +0100)] 
coverity: #1425867

do not pass NULL pointer to chdir()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425869
Christian Brauner [Sat, 9 Dec 2017 18:18:09 +0000 (19:18 +0100)] 
coverity: #1425869

do not unmap prematurely

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425870
Christian Brauner [Sat, 9 Dec 2017 18:16:25 +0000 (19:16 +0100)] 
coverity: #1425870

check snprintf() return value

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolxccontainer: cleanup {attach,detach}_interface()
Christian Brauner [Sun, 10 Dec 2017 01:45:54 +0000 (02:45 +0100)] 
lxccontainer: cleanup {attach,detach}_interface()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolxccontainer: only attach netns on netdev detach
Christian Brauner [Sun, 10 Dec 2017 01:41:14 +0000 (02:41 +0100)] 
lxccontainer: only attach netns on netdev detach

Detaching network namespaces as an unprivileged user is currently not possible
and attaching to the user namespace will mean we are not allowed to move the
network device into an ancestor network namespace.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425874 + cleanup
Christian Brauner [Sat, 9 Dec 2017 18:12:48 +0000 (19:12 +0100)] 
coverity: #1425874 + cleanup

- check for memory allocation failure
- free allocated memory
- cleanup function

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoconf: avoid spawning unnecessary subshells
Jonathan Calmels [Mon, 11 Dec 2017 22:43:06 +0000 (14:43 -0800)] 
conf: avoid spawning unnecessary subshells

Signed-off-by: Jonathan Calmels <jcalmels@nvidia.com>
7 years agotools: block using lxc-execute without config file
Christian Brauner [Tue, 12 Dec 2017 00:38:40 +0000 (01:38 +0100)] 
tools: block using lxc-execute without config file

Moving away from internal symbols we can't do hacks like we currently do in
lxc-start and call internal functions like lxc_conf_init(). This is unsafe
anyway. Instead, we should simply error out if the user didn't give us a
configuration file to use. lxc-start refuses to start in that case already.

Relates to discussion in https://github.com/lxc/go-lxc/pull/96#discussion_r155075560 .
Closes #2023.

Reported-by: Felix Abecassis <fabecassis@nvidia.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agooverlay: fix out-of-bounds copy
Jonathan Calmels [Mon, 11 Dec 2017 22:49:57 +0000 (14:49 -0800)] 
overlay: fix out-of-bounds copy

Signed-off-by: Jonathan Calmels <jcalmels@nvidia.com>
7 years agocoverity: #1425879
Christian Brauner [Sat, 9 Dec 2017 18:00:37 +0000 (19:00 +0100)] 
coverity: #1425879

do not double close file descriptor

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425883
Christian Brauner [Sat, 9 Dec 2017 17:54:28 +0000 (18:54 +0100)] 
coverity: #1425883

ensure \0-termination

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425884
Christian Brauner [Sat, 9 Dec 2017 17:46:56 +0000 (18:46 +0100)] 
coverity: #1425884

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1428855
Christian Brauner [Sat, 9 Dec 2017 17:45:47 +0000 (18:45 +0100)] 
coverity: #1428855

remove logically dead code

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425886
Christian Brauner [Sat, 9 Dec 2017 17:44:41 +0000 (18:44 +0100)] 
coverity: #1425886

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425893
Christian Brauner [Sat, 9 Dec 2017 17:35:33 +0000 (18:35 +0100)] 
coverity: #1425893

used calculated string length when copying into buffer

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1426029
Christian Brauner [Sat, 9 Dec 2017 17:27:25 +0000 (18:27 +0100)] 
coverity: #1426029

fix use after free

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoconf: fix lxc.prlimit clearing
Christian Brauner [Mon, 11 Dec 2017 05:22:56 +0000 (06:22 +0100)] 
conf: fix lxc.prlimit clearing

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolegacy confile: fix legacy network parser
Christian Brauner [Mon, 11 Dec 2017 05:03:45 +0000 (06:03 +0100)] 
legacy confile: fix legacy network parser

This fixes a bug introduced by:

commit 94f0035bf636ba853451d59c129e26d94850c04d
Author: Christian Brauner <christian.brauner@ubuntu.com>
Date:   Thu Dec 7 15:07:26 2017 +0100

    coverity: #1425924

    remove logically dead condition

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Coverity's bug analysis is correct but my fix wasn't.

This commit fixes a bunch of other bugs I just spotted as well.

This unblocks #2009.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agotravis: Fix build failure
Stéphane Graber [Sat, 9 Dec 2017 06:50:37 +0000 (01:50 -0500)] 
travis: Fix build failure

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
7 years agolxc: Distinguish pthread_mutex_unlock error messages
Marcos Paulo de Souza [Fri, 8 Dec 2017 02:02:18 +0000 (00:02 -0200)] 
lxc: Distinguish pthread_mutex_unlock error messages

The same message exists in lxclock.c and cgmanager.c, so print the
filename along with the message.

Before this patch:
lxc-destroy -n u1
pthread_mutex_unlock returned:1 Operation not permitted

After this patch:
xc-destroy -n u1
lxclock.c: pthread_mutex_unlock returned:1 Operation not permitted

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
7 years agocoverity: #1425888
Christian Brauner [Thu, 7 Dec 2017 14:24:28 +0000 (15:24 +0100)] 
coverity: #1425888

check return value of getifaddrs()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425889
Christian Brauner [Thu, 7 Dec 2017 14:21:57 +0000 (15:21 +0100)] 
coverity: #1425889

do not call close on bad file descriptor

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425890
Christian Brauner [Thu, 7 Dec 2017 14:18:35 +0000 (15:18 +0100)] 
coverity: #1425890

silence complaint about unchecked return value from library function

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425895
Christian Brauner [Thu, 7 Dec 2017 14:17:11 +0000 (15:17 +0100)] 
coverity: #1425895

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425921
Christian Brauner [Thu, 7 Dec 2017 14:14:37 +0000 (15:14 +0100)] 
coverity: #1425921

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425922
Christian Brauner [Thu, 7 Dec 2017 14:11:16 +0000 (15:11 +0100)] 
coverity: #1425922

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425923
Christian Brauner [Thu, 7 Dec 2017 14:09:46 +0000 (15:09 +0100)] 
coverity: #1425923

avoid NULL-pointer dereference

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425924
Christian Brauner [Thu, 7 Dec 2017 14:07:26 +0000 (15:07 +0100)] 
coverity: #1425924

remove logically dead condition

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425929
Christian Brauner [Thu, 7 Dec 2017 13:59:55 +0000 (14:59 +0100)] 
coverity: #1425929

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425743
Christian Brauner [Wed, 6 Dec 2017 20:57:55 +0000 (21:57 +0100)] 
coverity: #1425743

remove logically dead code

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425742
Christian Brauner [Wed, 6 Dec 2017 20:48:37 +0000 (21:48 +0100)] 
coverity: #1425742

fix error condition check

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425740
Christian Brauner [Wed, 6 Dec 2017 20:39:45 +0000 (21:39 +0100)] 
coverity: #1425740

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425739
Christian Brauner [Wed, 6 Dec 2017 20:38:14 +0000 (21:38 +0100)] 
coverity: #1425739

check snprintf() return value

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425737
Christian Brauner [Wed, 6 Dec 2017 20:30:42 +0000 (21:30 +0100)] 
coverity: #1425737

free allocated memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425735
Christian Brauner [Wed, 6 Dec 2017 20:22:03 +0000 (21:22 +0100)] 
coverity: #1425735

use correct inequality comparison

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocoverity: #1425734
Christian Brauner [Wed, 6 Dec 2017 20:16:38 +0000 (21:16 +0100)] 
coverity: #1425734

free memory on error

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agotests: expand tests for shortlived init processes
Christian Brauner [Wed, 6 Dec 2017 14:56:35 +0000 (15:56 +0100)] 
tests: expand tests for shortlived init processes

This adds additional test for app containers.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolxc_init: changed minor details
RicardoSanchezA [Wed, 6 Dec 2017 17:01:04 +0000 (11:01 -0600)] 
lxc_init: changed minor details

Signed-off-by: RicardoSanchezA <ricardo.sanchez@utexas.edu>
7 years agolxc_init: add custom argument parser
RicardoSanchezA [Wed, 6 Dec 2017 15:30:44 +0000 (09:30 -0600)] 
lxc_init: add custom argument parser

lxc_init.c should not depend on tools/arguments.{c,h}, thus it needs its own custom argument parser

Signed-off-by: RicardoSanchezA <ricardo.sanchez@utexas.edu>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolxc_init: move up to src/lxc
RicardoSanchezA [Wed, 6 Dec 2017 15:28:19 +0000 (09:28 -0600)] 
lxc_init: move up to src/lxc

lxc_init.c is actually not a tool, thus it doesn't belong to the tools/ subfolder

Signed-off-by: RicardoSanchezA <ricardo.sanchez@utexas.edu>
7 years agolxccontainer: handle execute containers correctly
Christian Brauner [Wed, 6 Dec 2017 14:37:40 +0000 (15:37 +0100)] 
lxccontainer: handle execute containers correctly

It doesn't make sense to error out when an app container doesn't pass explicit
arguments through c->start{l}().

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoexecute: pass logfile to lxc-init
Christian Brauner [Wed, 6 Dec 2017 14:37:12 +0000 (15:37 +0100)] 
execute: pass logfile to lxc-init

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: return -ECONNRESET to caller
Christian Brauner [Wed, 6 Dec 2017 14:33:23 +0000 (15:33 +0100)] 
commands: return -ECONNRESET to caller

Callers can then make a decision whether they want to consider the peer closing
the connection an error or not. For example, a c->wait(c, "STOPPED", -1) call
can then consider a ECONNRESET not an error but rather see it - correctly - as
a container exiting before being able to register a state client.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: tell mainloop to reap client fd on error
Christian Brauner [Sat, 25 Nov 2017 16:51:01 +0000 (17:51 +0100)] 
commands: tell mainloop to reap client fd on error

This is the proper way to handle errors.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolxccontainer: restore non-blocking shutdown
Christian Brauner [Fri, 24 Nov 2017 22:19:34 +0000 (23:19 +0100)] 
lxccontainer: restore non-blocking shutdown

If timeout is set to 0 don't block.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: tweak locking
Christian Brauner [Fri, 24 Nov 2017 11:51:04 +0000 (12:51 +0100)] 
commands: tweak locking

Take the lock on the list after we've done all necessary work and check state.
If we are in requested state, do cleanup and return without adding the state
client to the state client list.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agotest: add state server tests
Christian Brauner [Wed, 22 Nov 2017 20:32:07 +0000 (21:32 +0100)] 
test: add state server tests

This checks whether multiple concurrent waiters all get notified by the state
server.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: allow waiting for all states
Christian Brauner [Tue, 21 Nov 2017 19:42:28 +0000 (20:42 +0100)] 
commands: allow waiting for all states

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agostart: don't lock setting the state
Christian Brauner [Wed, 22 Nov 2017 13:32:56 +0000 (14:32 +0100)] 
start: don't lock setting the state

- setting the handler->state value is atomic on any POSIX implementation since
  we're dealing with an integer (enum/lxc_state_t)
- while the state clients are served it is not possible for lxc_set_state() to
  transition to the next state anyway so there's no danger in moving to the
  next state with clients missing it
- we only care about the list being modified

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: don't lock the whole command
Christian Brauner [Wed, 22 Nov 2017 13:29:32 +0000 (14:29 +0100)] 
commands: don't lock the whole command

There are multiple reasons why this is not required:
- every command is transactional
- we only care about the list being modified not the memory allocation and
  other costly operations

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: don't lock atomic operations
Christian Brauner [Wed, 22 Nov 2017 13:25:10 +0000 (14:25 +0100)] 
commands: don't lock atomic operations

We're dealing with an integer (lxc_state_t which is an enum). Any POSIX
implementation makes those operations atomic so there's not need in locking
this.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocommands: don't traverse whole list
Christian Brauner [Wed, 22 Nov 2017 13:13:07 +0000 (14:13 +0100)] 
commands: don't traverse whole list

When we remove a state client fd there's not reason to walk the whole list. We
can simply break once we found and removed the fd.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agostart: set loglevel correctly
Christian Brauner [Tue, 5 Dec 2017 23:16:38 +0000 (00:16 +0100)] 
start: set loglevel correctly

We want the loglevel that the user specified when starting the container
because it overrides the default one set in the config.

Closes #2003.

Reported-by: Felix Abecassis <fabecassis@nvidia.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoarguments: move to tools/ subdirectory
RicardoSanchezA [Tue, 5 Dec 2017 04:03:52 +0000 (22:03 -0600)] 
arguments: move to tools/ subdirectory

The arguments.{c,h} file should not be a part of liblxc itself. It should only
be used for the lxc tools.

Signed-off-by: RicardoSanchezA <ricardo.sanchez@utexas.edu>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agolxc_execute: properly figure out number of needed arguments
Serge Hallyn [Tue, 5 Dec 2017 04:30:26 +0000 (22:30 -0600)] 
lxc_execute: properly figure out number of needed arguments

The lxc_log args have noghing to do with lxc.rootfs.path, and
we need room for a NULL at end of arguments.

How this bug was hidden for so long I don't know - I can only
trigger it on certain systems under certain conditions, but it's
definately wrong as is.

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
7 years agotest: reenable Coverity integration
Christian Brauner [Mon, 4 Dec 2017 22:41:45 +0000 (23:41 +0100)] 
test: reenable Coverity integration

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoattach: do not fail on non-existing namespaces
Christian Brauner [Mon, 4 Dec 2017 11:26:55 +0000 (12:26 +0100)] 
attach: do not fail on non-existing namespaces

Closes #1993.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocriu: silence static analysis
Christian Brauner [Mon, 4 Dec 2017 00:48:46 +0000 (01:48 +0100)] 
criu: silence static analysis

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoconfile: remove dead assignment
Christian Brauner [Mon, 4 Dec 2017 00:44:45 +0000 (01:44 +0100)] 
confile: remove dead assignment

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agocriu: initialize status
Christian Brauner [Mon, 4 Dec 2017 00:41:49 +0000 (01:41 +0100)] 
criu: initialize status

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoconfile_legacy: prevent null pointer deref
Christian Brauner [Mon, 4 Dec 2017 00:38:01 +0000 (01:38 +0100)] 
confile_legacy: prevent null pointer deref

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoconf: prevent null pointer dereference
Christian Brauner [Mon, 4 Dec 2017 00:34:50 +0000 (01:34 +0100)] 
conf: prevent null pointer dereference

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoInsert missing "echo" after "is_enabled"
Pierre LALET [Sun, 3 Dec 2017 11:32:39 +0000 (12:32 +0100)] 
Insert missing "echo" after "is_enabled"

Signed-off-by: Pierre LALET <pierre.lalet@cea.fr>
7 years agoFix SETCOLOR_FAILURE evaluation
Pierre LALET [Sun, 3 Dec 2017 10:28:07 +0000 (11:28 +0100)] 
Fix SETCOLOR_FAILURE evaluation

Signed-off-by: Pierre LALET <pierre.lalet@cea.fr>
7 years agoAdd bash completion to list backing store types for lxc-create -B
Abbas Ally [Sun, 3 Dec 2017 05:51:44 +0000 (05:51 +0000)] 
Add bash completion to list backing store types for lxc-create -B
- Backing Store types are hard-coded (Not sure how to get programmatically)
- Closes #1236

Signed-off-by: Abbas Ally <abbasally5@yahoo.com>
7 years agoAdd new dependency to Slackware template
CC-Hsu [Sat, 2 Dec 2017 11:27:34 +0000 (19:27 +0800)] 
Add new dependency to Slackware template

I followed the [changelog of Slackware-current]<http://www.slackware.com/changelog/>,
and found that Slackware-current split hostname utility from util-linux package in Nov 17 2017.
So I add the new package to the template.

Signed-off-by: Chia-Chun Hsu <a12321aabb@gmail.com>
7 years agoUpdate gentoo.moresecure.conf.
i.Dark_Templar [Sat, 2 Dec 2017 07:33:51 +0000 (10:33 +0300)] 
Update gentoo.moresecure.conf.

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

Signed-off-by: i.Dark_Templar <darktemplar@dark-templar-archives.net>
7 years agolxc_unshare: Add uid_mapping when creating userns
Marcos Paulo de Souza [Wed, 29 Nov 2017 01:49:28 +0000 (23:49 -0200)] 
lxc_unshare: Add uid_mapping when creating userns

Change conf.c to export function write_id_mapping, which will now be
called inside main function of lxc_unshare.c.

This is required because setuid syscalls only permits a new userns to
set a new uid if the uid of parameter is mapped inside the ns using
uid_map file[1]. So, just after the clone invocation, map the uid passed as
parameter into the newly created user namespace, and put the current uid
as the ID-outside-ns. After the mapping is done, setuid call succeeds.

Closes: #494
[1] https://elixir.free-electrons.com/linux/latest/source/kernel/user_namespace.c#L286

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
7 years agoutils: declare sethostname() static inline
Christian Brauner [Fri, 1 Dec 2017 22:18:09 +0000 (23:18 +0100)] 
utils: declare sethostname() static inline

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agoconfile_utils: simplify lxc_config_net_hwaddr
Felix Abecassis [Wed, 29 Nov 2017 04:27:53 +0000 (20:27 -0800)] 
confile_utils: simplify lxc_config_net_hwaddr

In addition to the memory corruption fixed in ee3e84df78424d26fc6c90862fbe0fa92a686b0d,
this function was also performing invalid memory accesses for the following inputs:
- `lxc.net`
- `lxc.net.`
- `lxc.net.0.`
- `lxc.network`
- `lxc.network.0.`

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
7 years agoconfile: error out if a network configuration key has no subkey
Felix Abecassis [Wed, 29 Nov 2017 04:27:44 +0000 (20:27 -0800)] 
confile: error out if a network configuration key has no subkey

This prevent an infinite recursion in the case of "lxc.net.0. = a"

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
7 years agolog: fix infinite loop with multiple lxc.log.syslog keys
Felix Abecassis [Wed, 29 Nov 2017 04:27:39 +0000 (20:27 -0800)] 
log: fix infinite loop with multiple lxc.log.syslog keys

This caused the linked list of appenders to loop on itself, creating
an infinite logging loop in `__lxc_log_append`.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
7 years agotests: add a function for negative netdev tests
Felix Abecassis [Wed, 29 Nov 2017 04:27:34 +0000 (20:27 -0800)] 
tests: add a function for negative netdev tests

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
7 years agoconfile: fix memory leak
Felix Abecassis [Wed, 29 Nov 2017 04:27:28 +0000 (20:27 -0800)] 
confile: fix memory leak

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
7 years agotools/lxc_wait: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:55:53 +0000 (17:55 -0600)] 
tools/lxc_wait: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
7 years agotools/lxc_usernsexec: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:54:11 +0000 (17:54 -0600)] 
tools/lxc_usernsexec: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
7 years agotools/lxc_unshare: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:48:06 +0000 (17:48 -0600)] 
tools/lxc_unshare: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
7 years agotools/lxc_unfreeze: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:38:48 +0000 (17:38 -0600)] 
tools/lxc_unfreeze: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
7 years agotools/lxc_top: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:35:45 +0000 (17:35 -0600)] 
tools/lxc_top: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
7 years agotools/lxc_stop: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:29:25 +0000 (17:29 -0600)] 
tools/lxc_stop: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
7 years agotools/lxc_start: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:16:07 +0000 (17:16 -0600)] 
tools/lxc_start: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
7 years agotools/lxc_snapshot: removed internal logging
AustinReichert [Tue, 28 Nov 2017 23:07:24 +0000 (17:07 -0600)] 
tools/lxc_snapshot: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>