tests: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

conf: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

tools: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

utils: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

string_utils: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

network: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

monitor: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

lxccontainer: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

macro: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

lsm: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

log: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

confile: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

cgfsng: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

caps: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

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

macro: add INTTYPE_TO_STRLEN()

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

macro: add PTR_TO_INT() and INT_TO_PTR()

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

macro: move LXC_CMD_DATA_MAX from commands.h

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

macro: add LXC_AUDS_ADDR_LEN

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

compiler: add compiler.h header

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

configure: reorder header checks

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

build: fix musl

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

Merge pull request #2574 from brauner/2018-08-26/cgroup_keep

 confile: add lxc.cgroup.keep

cgroups: don't escape if lxc.cgroup.keep is true

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Felix Abecassis <fabecassis@nvidia.com>
Cc: Jonathan Calmels <jcalmels@nvidia.com>

confile: add lxc.cgroup.keep

This adds the new lxc.cgroup.keep config key. The key can be used to instruct
LXC to not escape to never escape to the root cgroup. This makes it easy for
users to adhere to restrictions enforced by cgroup2 and systemd. Specifically,
this makes it possible to run LXC containers as systemd services.

Note that cgroup v1 is considered legacy and will not see additional
controllers being added to it. This means that it is safe to use
lxc.cgroup.keep as config key since there is no "keep" controller. The only way
a conflict can be introduced is if the user is creating a named controller. I
think this case can be safely ignored since it is super rare and also the users
problem.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Felix Abecassis <fabecassis@nvidia.com>
Cc: Jonathan Calmels <jcalmels@nvidia.com>

start: do not initialize cgroup_ops twice

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

Merge pull request #2570 from brauner/2018-08-23/fix_privileged_logging

execute: pass /proc/self/fd/<nr>

execute: pass /proc/self/fd/<nr>

Passing /proc/1/fd/<nr> presupposes that CLONE_NEWPID was specified. This isn't
the case when users use lxc.namespace.keep = pid to inherit pid namespaces.
Pass /proc/self/fd/<nr> instead.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Reported-by: Mrinal Dhillon <mdhillon@juniper.net>

Merge pull request #2569 from brauner/2018-08-23/fix_unpriv_execute_logging

execute: skip lxc-init logging when unprivileged

execute: skip lxc-init logging when unprivileged

Unprivileged app containers will not be able to open the passed in
/proc/1/fd/<idx> log path and will thus currently fail completely as soon as
any log level or log file is passed.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Reported-by: Mrinal Dhillon <mdhillon@juniper.net>

Merge pull request #2568 from brauner/2018-08-22/ifaddrs

include: add safe getifaddrs() version

Makefile: conditionalize ifaddrs.h inclusion

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

ifaddrs: add safe implementation of getifaddrs()

The old version was crazy. This replaces it with an internal version based on
musl.

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

Merge pull request #2565 from brauner/2018-08-22/more_fixes

remove last pam_cgfs special-casing

Merge pull request #2567 from stgraber/master

Fix typo

Fix typo

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

conf: add missing headers

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

Makefile: remove last pam_cgfs special-casing

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

string_utils: add remove_trailing_slashes()

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

string_utils: remove unused headers

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

string_utils: remove unnecessary include

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

initutils: remove useless comment

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

{file,string}_utils: remove NO_LOG

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

Merge pull request #2564 from brauner/2018-08-22/strerror_r_detection

log: handle strerror_r() versions + autotools: add --{disable,enable}-thread-safety

log: fail build on ENFORCE_THREAD_SAFETY error

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

autotools: add --{disable,enable}-thread-safety

Fail the build if --enable-thread-safety is passed and the environment cannot
guarantee thread-safety.

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

log: handle strerror_r() versions

Closes #2563.

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

Merge pull request #2562 from brauner/2018-08-22/check_compiler

autotools: check if compiler is new enough

start: add out_sync_fini cleanup label

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

autotools: check if compiler is new enough

We line up with the Linux kernel and won't support any compiler under 4.6.
Additionally, we also require at least gnu99 so this is due anyway.

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

Merge pull request #2554 from brauner/2018-08-21/attach_fixes

attach: bugfixes

Merge pull request #2561 from brauner/2018-08-21/test_pam_cgfs

Makefile: don't allow undefined symbols

Makefile: don't allow undefined symbols

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

macro: move macros from attach.c

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

attach: move struct declaration to top

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

macro: s/rexit()/_exit()/g

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

Merge pull request #2560 from brauner/2018-08-21/fix_fully_unprivileged_containers

conf: fix devpts mounting when fully unprivileged

Merge pull request #2558 from brauner/2018-08-21/pam_cgfs

pam_cgfs: build from the same sources as liblxc

conf: fix devpts mounting when fully unprivileged

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

pam_cgfs: build from the same sources as liblxc

Closes #2556.

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

utils: split into {file,string}_utils.{c,h}

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

Merge pull request #2559 from ssup2/master

start: Fix net iface remaining issue

start: Fix net iface remaining issue

When creating container that has multiple net ifaces fails
because of wrong net config, lxc doesn't remove previously created
net ifaces.

Solve this issue with changing return path in lxc_spawn().

Signed-off-by: Jungsub Shin jungsub_shin@tmax.co.kr

Merge pull request #2555 from tcharding/clang-format-cmd

cmd: Fix format issues found by clang-format

Merge pull request #2557 from 2xsec/bugfix

list: fix indent

list: fix indent

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

cmd: Fix format issues found by clang-format

clang-format finds a few format issues, lets fix these up.

Fix format issues found by clang-format.

Signed-off-by: Tobin C. Harding <me@tobin.cc>

Merge pull request #2552 from tcharding/cpp-check

cmd: Lint with cppcheck

cmd: Reduce scope of 'count' variable

Variable is used in one plaice only within a nested statement block.
The code is cleaner if the variable is declared near where it is used.
Found using cppcheck.

Reduce the scope of 'count' variable.

Signed-off-by: Tobin C. Harding <me@tobin.cc>

cmd: Do not reassign variable before it is used

cppcheck emits warning

  Variable 'ofd' is reassigned a value before the old one has been used.

We do not need to initialise a variable if it is assigned to on first use.

Signed-off-by: Tobin C. Harding <me@tobin.cc>

Merge pull request #2549 from brauner/2018-08-19/cmd_usernsexec_fixes

cmd: lxc-usernsexec fixes + macro: move declarations + config_utils: macvlan fixes

cmd: use goto for cleanup in lxc-usernsexec

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

Merge pull request #2550 from 2xsec/bugfix

storage: exit() => _exit()

Merge pull request #2542 from tcharding/signal-fail-2523

tools: Indicate container startup failure

Merge pull request #2553 from Blub/ttydir-path-fixup

conf: fix path/lxcpath mixups in tty setup

conf: fix path/lxcpath mixups in tty setup

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Fixes: 6947153da ("conf: use mknod() to create dummy mount target")

tools: lxc-wait: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

storage: exit() => _exit(). when exec is failed, child process needs to use _exit()

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

tools: Indicate container startup failure

When running lxc-autostart we do not currently indicate failure to start
containers, either partial failure i.e. some of the containers failed to
start or total failure i.e. all of the containers failed to start.

Indicate container startup failure.  For total failure exit(1), for
partial failure exit(2).

Signed-off-by: Tobin C. Harding <me@tobin.cc>

macro: add macvlan properties

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

macro: add missing headers

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

cmd: use safe number parsers in lxc-usernsexec

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

cmd: simplify lxc-usernsexec

Calculate length only once.

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

cmd: use utils.{c,h} helpers in lxc-usernsexec

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

cmd: move declarations to macro.h

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

cmd: lxc-usernsexec reorder includes

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

Merge pull request #2548 from 2xsec/bugfix

cmd: lxc-user-nic: change log macro & cleanups

cmd: lxc-user-nic: change log macro & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

Merge pull request #2547 from brauner/2018-08-18/fix_execute_parsing

tools: fix lxc-execute command parsing

Merge pull request #2545 from ljagiello/integer-overflow

storage/loop.c: integer overflow

lseek - integer overflow

The issue was introduced in PR (https://github.com/lxc/lxc/pull/1705):

Previous code:
```
  if (lseek(fd, size, SEEK_SET) < 0) {
    SYSERROR("Error seeking to set new loop file size");
    close(fd);
    return -1;
  }
```
New code:
```
  int fd, ret;

  [...]

  ret = lseek(fd, size, SEEK_SET);
  if (ret < 0) {
    SYSERROR("Failed to seek to set new loop file size for loop "
       "file \"%s\"", path);
    close(fd);
    return -1;
  }
```

Based on http://man7.org/linux/man-pages/man2/lseek.2.html:
> Upon successful completion, lseek() returns the resulting offset
> location as measured in bytes from the beginning of the file.

So in this case value of `size` and `size` is `uint64_t`.

This fix change declaration of `ret`, but it can be fixed in other ways.
Let me know what works for you.

This PR fix issues (https://github.com/lxc/lxc/issues/1872).

Signed-off-by: Lukasz Jagiello <lukasz@wikia-inc.com>

tools: fix lxc-execute command parsing

Initialize buf to avoid parsing random data later on.

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

Merge pull request #2546 from 2xsec/bugfix

storage_utils: move duplicated function from tools

storage_utils: move duplicated function from tools

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

Merge pull request #2544 from 2xsec/bugfix

tools: add default log priority & cleanups

tools: lxc-unfreeze: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

tools: lxc-freeze: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

tools: lxc-stop: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

tools: lxc-start: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

tools: lxc-execute: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

tools: lxc-device: add default log priority & cleanups

Signed-off-by: 2xsec <dh48.jeong@samsung.com>