cmd: Use 'void' instead of empty parameter list

checkpatch warns because of function definitions using empty parameter
list.  We should define these functions with 'void' as the parameter.

Use 'void' instead of empty parameter list for function definitions.

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

cmd: Use parenthesis around complex macro

checkpatch emits error:

    ERROR: Macros with complex values should be enclosed in parentheses

Safeguard macro by use of parenthesis.

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

Merge pull request #2535 from brauner/2018-08-16/cmd_fixes

log: add logging tools for commands; lxc-usernsexec: cleanup and bugfixes

lxc-usernsexec: cleanup and bugfixes

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

log: add  CMD_SYSINFO()

Add a thread-safe and uniform way to retrieve errno values in programs that are
shipped as part of LXC but are not expected to have access to the logging
system.

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

log: add  CMD_SYSERROR()

Add a thread-safe and uniform way to retrieve errno values in programs that are
shipped as part of LXC but are not expected to have access to the logging
system.

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

Merge pull request #2534 from tcharding/checkpatch

Checkpatch

Merge pull request #2532 from tcharding/unshare-err

usernsexec: Make err out vebose for unshare error

cmd: Move assignment out of if statement

checkpatch.pl emits error

    ERROR: do not use assignment in if condition

Move assignment out of if statement.

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

cmd: Fix whitespace ERRORS

checkpatch.pl emits a bunch of warnings about various whitespace
issues.  Fix all these as a single patch since they are all whitespace
only changes.

Fix whitespace issues found by checkpatch.pl

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

cmd: Do not initialise statics to 0

checkpatch.pl emits error

    ERROR: do not initialise statics to 0

Do not initialise statics to 0.

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

cmd: Correctly indent switch statement

checkpatch.pl emits error

    ERROR: do not use assignment in if condition

Correctly indent switch statement.

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

usernsexec: Make err out vebose for unshare error

Currently if lxc-usernsexec is run on a kernel without user namespaces
enabled the error message is

unshare: Invalid argument
read pipe: Success

This error message 'Invalid argument' does not point at the root cause
of the error.  We can help the user out by giving a more detailed error
message and also not using perror() if errno==0.

Improve error message by
 - Printing unshare flags
 - Printing suggested cause of failure (user namespace not enabled)
 - Print error message with fprintf() if errno==0 (EOF)

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

Merge pull request #2533 from tcharding/docs

doc: Fix minor grammatical errors

doc: Fix minor grammatical errors

Current we have a few minor grammatical errors in the documentation for
lxc container configuration.

Fix minor grammatical errors.

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

Merge pull request #2531 from brauner/2018-08-16/minor_fixes

state: s/sleep()/nanosleep()/

state: s/sleep()/nanosleep()/

sleep() is not thread-safe but nanosleep() is. Since no resources are allocated
in lxc_wait() it is safe to call nanosleep() without cancellation handlers.

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

Merge pull request #2530 from brauner/2018-08-16/minor_fixes

lxccontainer: minor fixes

lxccontainer: minor fixes

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

Merge pull request #2527 from brauner/2018-08-15/file_lock_fixes

lxccontainer: improve file locking

lxclock: improve file locking

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

lxccontainer: improve file locking

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

Merge pull request #2526 from brauner/2018-08-14/fix_ongoing_create_check

lxccontainer: fix F_OFD_GETLK checks

lxccontainer: fix F_OFD_GETLK checks

When we check whether an open file description lock has been taken on a file we
need to set the l_pid field to 0 otherwise the kernel will send back EINVAL.
Additionally, the kernel will not do pid translation and simply set the l_pid
value to -1.

Fixes https://discuss.linuxcontainers.org/t/container-deleted-or-stopped-when-lxc-ls-executed-concurrently/2439

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

Merge pull request #2525 from 2xsec/bugfix

coverity: #1438392

coverity: #1438392

Dereference before null check

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

Merge pull request #2524 from 2xsec/bugfix

fix thread-safe issue (localtime => localtime_r)

fix thread safe issue(localtime => localtime_r)

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

macro: remove duplicated define

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

Merge pull request #2521 from brauner/2018-08-11/fix_netnsid_allocation

netlink: add __netlink_{send,recv,transaction}

netlink: add __netlink_{send,recv,transaction}

These allow to pass a struct nlmsghdr directly and are used in the higher level
netlink_{send,rcv,transaction}.

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

Merge pull request #2520 from brauner/2018-08-11/fix_netnsid_allocation

netns: improve netnsid allocation

start: make netnsid allocation failures non-fatal

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

netns: improve netnsid allocation

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

macro: add NLMSG_ERROR

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

Merge pull request #2519 from 2xsec/bugfix

fix assignment of signed to bigger unsigned issue

fix assignment of signed to bigger unsigned issue

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

Merge pull request #2516 from 2xsec/bugfix

tests: containertests: fix dereference pointer c

fix tainted int loop bound issue

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

tests: containertests: fix dereference pointer c

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

Merge pull request #2518 from brauner/2018-08-09/network_netns_id

network: type fixes lxc_netns_set_nsid()

network: type fixes lxc_netns_set_nsid()

The kernel expects a __s32 for NETNSA_NSID and a __u32 for NETNSA_FD.

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

Merge pull request #2515 from brauner/2018-02-06/network_netns_id

netns: allocate network namespace id

netns: vendor NETNSA_*

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

travis: add linux-libc-dev

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

macro: move network macros from utils.h

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

netns: allocate network namespace id

Start to allocate a new network namespace id for each container.

Relates to https://github.com/lxc/lxd/issues/4831.

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

MAINTAINERS: add Wolfgang Bumiller

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

Merge pull request #2513 from brauner/2018-08-06/fix_busybox

templates: avoid endless loop

CVE 2018-6556: verify netns fd in lxc-user-nic

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

templates: avoid endless loop

Closes #2512.

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

Merge pull request #2495 from 2xsec/bugfix

add default log priority & cleanups

Merge pull request #2511 from 2xsec/coverity

fix coverity issues

coverity: #1438232

Failure to restore non-local value

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

pam_cgfs: cleanups

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

coverity: #1438231

Dereference after null check

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

coverity: #1438230

Logically dead code

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

coverity: #1438229

Resource leak

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

coverity: #1438233

Resource leak

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

coverity: #1438234

Resource leak

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

coverity: #1438235

Resource leak

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

coverity: #1438236

Resource leak

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

tools: lxc-unshare: apply default log priority

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

log: add default log priority

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

log: function cleanups

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

Merge pull request #2510 from brauner/2018-08-05/cap_fixes

tree-wide: pass unsigned long to prctl()

tree-wide: pass unsigned long to prctl()

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

Merge pull request #2508 from brauner/2018-08-04/cap_fixes

macro: add new macro header, caps: bugfixes, log: bugfixes

log: bugfixes

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

caps: bugfixes

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

macro: add new macro header

This allows us to use a bunch of macros in our static build for init.lxc.static
without having to link against all of utils.{c,h}.

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

travis: export CFLAGS=-O0 for coverity

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

travis: build with -O0 for coverity

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

Merge pull request #2505 from brauner/2018-07-31/bugfixes

coverity: #438136

READEM: update Serge's mail address

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Serge Hallyn <serge@hallyn.com>

coverity: #438136

String not null terminated

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

Merge pull request #2503 from tenforward/japanese

doc: Add incompatibility with network type=none into Japanese man

doc: Add incompatibility with network type=none into Japanese man

Update for commit e4b3e36

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

Merge pull request #2499 from brauner/lxc/master

bugfixes

Merge pull request #2475 from brauner/2018-07-16/monitor_signal_pdeath

conf: improve rootfs setup

Merge pull request #2502 from brauner/2018-07-27/fix_max_devpts_option

conf: mount devpts without "max" on EINVAL

conf: don't return a clobbered errno value

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

conf: mount devpts without "max" on EINVAL

The "max" option to devpts got introduced in kernel 3.4.

Closes #2490.

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

Merge pull request #2500 from akosiaris/patch-1

Unprivileged's incompatibility with type=none docs

Unprivileged's incompatibility with type=none docs

Unprivileged containers are not compatible with sharing the
host namespace due to an inability to mount sysfs. Add docs
in lxc.container.conf to document that out.

Refs #2463

Signed-off-by: Alexandros Kosiaris <akosiaris@gmail.com>

caps: handle EINTR in read()

We don't want to link caps.{c,h} against utils.{c,h} for the sake of our static
builds init.lxc.static. This means lxc_write_nointr() will not be available. So
handle it EINTR.

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

log: handle EINTR in read()

We don't want to link log.{c,h} against utils.{c,h} for the sake of our static
builds init.lxc.static. This means lxc_write_nointr() will not be available. So
handle it EINTR.

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

utils: s/read()/lxc_read_nointr()/g

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

terminal: s/read()/lxc_read_nointr()/g

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

monitor: s/write()/lxc_write_nointr()/g

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

monitor: s/read()/lxc_read_nointr()/g

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

apparmor: s/read()/lxc_read_nointr()/g

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

tools: s/write()/lxc_write_nointr()/g

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

tools: s/read()/lxc_read_nointr()/g

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

sync: s/write()/lxc_write_nointr()/g

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

sync: s/read()/lxc_read_nointr()/g

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

network: s/write()/lxc_write_nointr()/g

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

network: s/read()/lxc_read_nointr()/g

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

lxccontainer: s/read()/lxc_read_nointr()/g

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

lxccontainer: s/write()/lxc_write_nointr()/g

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