confile: add lxc.cgroup2.[controller].[property]

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

cgroups: cgfsng_set: handle unified hierarchy

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

cgroups: cgfsng_get: handle unified hierarchy

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

cgroups: cgfsng_attach: handle unified hierarchy

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

cgroups: cgfsng_create: handle unified hierarchy

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

cgroups: get controllers on the unified hierarchy

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

Merge pull request #2116 from brauner/2018-01-29/legacy_network_fixes

confile_legacy: fix legacy network parser

confile_legacy: fix legacy network parser

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

Merge pull request #2102 from brauner/2018-01-22/lsm_simplifications

lsm: simplifcations

Merge pull request #2113 from marcosps/seccomp_return

seccomp.c: Use return instead of attribution and return

seccomp.c: Use return instead of attribution and return

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>

Merge pull request #2112 from stgraber/master

debian: Use iproute2 instead of iproute

debian: Use iproute2 instead of iproute

The package has pretty much always been iproute2 with iproute being an
alias for it, the alias is now gone so we need to use iproute2.

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

Merge pull request #2111 from tych0/unpriv-fixups

Unpriv fixups

rename am_unpriv to am_host_unpriv

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

better unprivileged detection

In particular, if we are already in a user namespace we are unprivileged,
and doing things like moving the physical nics back to the host netns won't
work. Let's do the same thing LXD does if euid == 0: inspect
/proc/self/uid_map and see what that says.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

better check for lock dir

Consider the case where we're running in a user namespace but in the host's
mount ns with the host's filesystem (something like
lxc-usernsexec ... lxc-execute ...), in this case, we'll be euid 0, but we
can't actually write to /run. Let's improve this locking check to make sure
we can actually write to /run before we decide to actually use it as our
locking dir.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

Merge pull request #2109 from duguhaotian/new

[cgfsng] show wrong errno

[cgfsng] show wrong errno

lxc_cgroup_set_data: h = get_hierarchy(controller);
if h is NULL, now errno is old, it donot set new one.
And then,
cgfsng_setup_limits:

    if (lxc_cgroup_set_data(cg->subsystem, cg->value, d)) {
if (do_devices && (errno == EACCES ||
errno == EPERM)) {
WARN("Error setting %s to %s for %s",
cg->subsystem, cg->value,
d->name);
continue;
}
SYSERROR("Error setting %s to %s for
 %s",
 cg->subsystem, cg->value,
 d->name);
goto out;
}

SYSERROR will show old errno, make me confused.

Signed-off-by: duguhaotian <duguhaotian@gmail.com>

Merge pull request #2099 from brauner/2018-01-20/attach_init_pty

bugfixes

Merge pull request #2103 from marcosps/forward_not_used

network.c: Remove ip_forward_set and callers

network.c: Remove ip_forward_set and callers

The last user of ip_forward_set, lxc_ip_forward_on and
lxc_ip_forward_off was in 2009:

commit 92d385229be040cf034ac6efd9405b7bdfe06a3e
Author: Daniel Lezcano <dlezcano@fr.ibm.com>
Date:   Thu Oct 22 15:33:40 2009 +0200

    remove test directory

These functions are not called anymore.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>

autotools: do not link against libapparmor

Since we write the label directly without going through the AppArmor API it
doesn't make sense to link against it.

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

apparmor: do not call aa_change_profile()

We can simply write the label ourselves. There's no magic happening.

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

lsm: add lsm_process_label_set_at()

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

lsm: add lsm_process_label_fd_get()

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

lsm: non-functional changes

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

Merge pull request #2092 from lifeng68/modify_console_create

Create console when the rootfs is NULL

Fix comments and add check in lxc_poll.

Add check whether handler->conf->console.path is 'none'

Signed-off-by: LiFeng <lifeng68@huawei.com>

Merge pull request #2100 from lifeng68/Modify_git_ignore

Modify .gitignore

Modify .gitignore

Add:
src/tests/lxc-test-api-reboot
src/tests/lxc-test-criu-check-feature
src/tests/lxc-test-raw-clone
src/tests/lxc-test-share-ns
src/tests/lxc-test-state-server

Signed-off-by: LiFeng <lifeng68@huawei.com>

Merge pull request #2101 from tenforward/japanese

doc: Update Japanese lxc-attach(1) and lxc.container.conf(5)

doc: Update Japanese lxc-attach(1) and lxc.container.conf(5)

* Update for commit ba2be1a (attach: move pty allocation into api)
* Update for commit 5757588 (manpage: correct lxc.log.file conf option)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>

attach: non-functional changes

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

attach: setup /proc limits

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

start: fix mainloop cleanup goto statements

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

coverity: #1426694

remove logically dead code

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

coverity: #1426734

do not call close on bad fd

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

coverity: #1427190

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

coverity: #1427191

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

coverity: #1427638

avoid (however unlikely) double free

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

coverity: #1427639

remove logically dead code

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

coverity: #1427668

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

tools: fix android

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

tools: non-functional changes

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

attach: init struct

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

Merge pull request #2097 from mikemccracken/2018-01-19/report-storage-destroy

storage: treat return value from ops->destroy as int

Merge pull request #2096 from mikemccracken/patch-1

manpage: correct lxc.log.file conf option

Merge pull request #2095 from tych0/remove-lxc-init

unlink lxc-init

storage: treat return value from ops->destroy as int

r->ops->destroy() returns an int, -1 on error.
When assigned to a bool, this becomes true and hides errors.

Signed-off-by: Michael McCracken <mikmccra@cisco.com>

unlink lxc-init

It's sort of an implementation detail that this exists at all, and we
should probably not pollute the container's mount tables or FS with this.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

 Adapt lxc_setup_console() to bind mount 'console'

Signed-off-by: LiFeng <lifeng68@huawei.com>

manpage: correct lxc.log.file conf option

lxc.log.file instead of just lxc.log

Signed-off-by: Michael McCracken <mikmccra@cisco.com>

Merge pull request #2094 from tych0/propagate-exit-code

Propagate exit code for app containers

set exit status to 1 in the unknown si_code case

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

lxc-execute: actually exit with the status of the spawned task

Now that we have things propagated through init and liblxc correctly, at
least in non-daemon mode, we can exit with the actual exit status of the
task, instead of always succeeding, which is not so helpful.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

start: don't return false when the container's init exits nonzero

This seems slightly counter-intuitive, but IMO it's what we want.
Basically, ->start() should succeed if the container is spawned correctly
(similar to how golang's exec.Cmd.Start() returns nil if the thing spawns
correctly), and users can check error_num (i.e. golang's exec.Cmd.Wait())
to see how it exited.

This preserves previous behavior, which basically was that start was always
successful if the thing actually launched. Since we never kept track of
exit codes, this would always succeed too. Now that we do, it doesn't, and
this change is required.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

remember the exit code from the init process

error_num seems to be trying to remember the exit code of the init process,
except that nothing actually keeps track of it anywhere. So, let's add a
field to the handler, so that we can keep track of the process' exit
status, and the propagate it to error_num in struct lxc_container so that
people can use it.

Note that this is a slight behavior change, essentially instead of making
error_num always == the return code from start, now it contains slightly
more useful information (the actual exit status). But, there is only one
internal user of error_num which I'll fix in later in the series, so IMO
this is ok.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

lxc.init: correctly exit with the app's error code

Based on the comments in the code (and the have_status flag), the intent
here (and IMO, the desired behavior) should be for init.lxc to propagate
the actual exit code from the real application process up through.
Otherwise, it is swallowed and nobody can access it.

The bug being fixed here is that ret held the correct exit code, but when
it went around the loop again (to wait for other children) ret is
clobbered. Let's save the desired exit status somewhere else, so it can't
get clobbered, and we propagate things correctly.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

fix lxc_error_set_and_log to match the docs

The documentation for this function says if the task was killed by a
signal, the return code will be 128+n, where n is the signal number. Let's
make that actually true.

(We'll use this behavior in later patches.)

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

start: don't log stop/continue for non-init processes

This non-init forwarding check should really be before all the log messages
about "init continued" or "init stopped", since they will otherwise lie
about some process that wasn't init being stopped or continued.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

Create console when the rootfs is NULL

Signed-off-by: LiFeng <lifeng68@huawei.com>

Merge pull request #2089 from brauner/2018-01-17/restore_blocking_wait

lxccontainer: restore blocking wait()

commands: add LXC_CMD_SERVE_STATE_CLIENTS

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

freezer: non-functional changes

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

lxccontainer: restore blocking wait()

Closes #2027.
Closes lxc/go-lxc#98.

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

Merge pull request #2061 from brauner/2017-12-23/attach_allocate_pty_in_api

attach: add LXC_ATTACH_ALLOCATE_PTY

utils: check suffix length

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

test: log error on failure

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

utils: do not rely on unitialized variable

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

Merge pull request #2086 from kunkku/alpine-ptrace

lxc-alpine: allow retaining sys_ptrace per container

lxc-alpine: allow retaining sys_ptrace per container

Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>

Merge pull request #2085 from duguhaotian/master

[console] return wrong console logsize

[console] return wrong console logsize

get_config_console_logsize want console.buffer_size not c->autodev

Signed-off-by: duguhaotian <duguhaotian@gmail.com>

tests: do not call close() on invalid fd

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

console: set SFD_CLOEXEC on signal fd

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

start: non-functional changes

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

tools: honor --console and --console-log

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

attach: move pty allocation into api

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

attach_options: add log_fd argument

This will be used to log the output of attach to.

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

attach: minor tweaks

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

console: add lxc_pty_map_ids()

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

console: adapt lxc_console_mainloop_add()

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

attach: cleanup attach_child_main()

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

console: add some pty helpers

- int lxc_make_controlling_pty()
- int lxc_login_pty()
- void lxc_pty_conf_free()
- void lxc_pty_info_init()
- void lxc_pty_init()

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

start: non-functional changes

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

conf: move ringbuffer members to anonymous struct

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

console: move pty creation to separate function

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

confile: improve log messages

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

Merge pull request #2080 from tych0/add-idmap-parse-error-message

add some idmap parsing error messages

add some idmap parsing error messages

otherwise, we just get a return value of false from setting config failure,
with no indication as to what actually failed in the log.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

Merge pull request #2078 from tych0/usernsexec-exit-status

fix up lxc-usernsexec's exit status

fix up lxc-usernsexec's exit status

* exit(1) when there is an option parsing error
* exit(0) when the user explicitly asks for help
* exit(1) when the user specifies an invalid option

Signed-off-by: Tycho Andersen <tycho@tycho.ws>

Merge pull request #2077 from lifeng68/Fix_segment_fault

Add return check for 'lxc_cmd_get_name'

Add return check for 'lxc_cmd_get_name'

If 'lxc_cmd_get_name' failed and return with NULL, this would cause a segment fault.

Signed-off-by: LiFeng <lifeng68@huawei.com>

Merge pull request #2075 from stgraber/master

lxc_get_version() should show the "-devel" suffix

Include -devel suffix in version string

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

Fix broken indentation

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

Merge pull request #2067 from brauner/2018-01-03/allow_fully_unprivileged_containers

conf: write "deny" to /proc/[pid]/setgroups

Merge pull request #2068 from brauner/2018-01-03/cleanup_command_after_revert

commands: fully revert set_running_config_item()