[lxc-devel] [lxc/lxc] 74363c: conf: close fd in lxc_setup_devpts()

Tue May 9 16:31:12 UTC 2017

  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: 74363c7847ec01efdd1d920a88cac2c4b5f46cd3
      https://github.com/lxc/lxc/commit/74363c7847ec01efdd1d920a88cac2c4b5f46cd3
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: close fd in lxc_setup_devpts()

This left the file descriptor to the underlying /dev/ptmx file open which
confused the hell out of criu. Let's close it.

Closes https://github.com/lxc/lxd/issues/3243.

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

  Commit: 8a807a12c3a5c2cb60f6c5e3b99c19617efbde2d
      https://github.com/lxc/lxc/commit/8a807a12c3a5c2cb60f6c5e3b99c19617efbde2d
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/utils.c
    M src/lxc/utils.h

  Log Message:
  -----------
  conf: non-functional changes

Closes #1475.

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

  Commit: 859ee65354a6cc69a1823d823ec75f1545ae83b7
      https://github.com/lxc/lxc/commit/859ee65354a6cc69a1823d823ec75f1545ae83b7
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/utils.c

  Log Message:
  -----------
  utils: tweak lxc_mount_proc_if_needed()

Create /proc directory if it doesn't exist.

Closes #1475.

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

  Commit: 94b8d2829edae0dbfd8c1a626f92f764c9df63ec
      https://github.com/lxc/lxc/commit/94b8d2829edae0dbfd8c1a626f92f764c9df63ec
  Author: Nikolay Martynov <(none)>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M templates/lxc-sshd.in

  Log Message:
  -----------
  Change sshd template to work with Ubuntu 17.04

A few things have changed and this patch makes container generated for sshd work in Ubuntu

Signed-off-by: Nikolay Martynov <mar.kolya at gmail.com>

  Commit: a49066d4663e1fa888f95ef4413a7bce27c20888
      https://github.com/lxc/lxc/commit/a49066d4663e1fa888f95ef4413a7bce27c20888
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: order mount options

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

  Commit: 052e7c704e680d525bf6412590c34d0674d15056
      https://github.com/lxc/lxc/commit/052e7c704e680d525bf6412590c34d0674d15056
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: add MS_LAZYTIME to mount options

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

  Commit: 20b3ccebf50248f7afe263133bfbcb4f1f990e96
      https://github.com/lxc/lxc/commit/20b3ccebf50248f7afe263133bfbcb4f1f990e96
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/monitor.c

  Log Message:
  -----------
  monitor: report errno on exec() error

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

  Commit: 9d24213e93463106f38464f9e0064469786364d2
      https://github.com/lxc/lxc/commit/9d24213e93463106f38464f9e0064469786364d2
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/af_unix.c
    M src/lxc/af_unix.h

  Log Message:
  -----------
  af unix: allow for maximum socket name

Abstract unix sockets need not be \0-terminated. So you can effectively have
107 chars available. If you \0-terminate you'll have a 106. Don't enforce
\0-termination in these low-level functions. Enforce it higher up which we
already do.

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

  Commit: 1177c9b01c496ddc6b10ab2329f80828ec9e7fb2
      https://github.com/lxc/lxc/commit/1177c9b01c496ddc6b10ab2329f80828ec9e7fb2
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/commands.c

  Log Message:
  -----------
  commands: avoid NULL pointer dereference

lxc_cmd_get_lxcpath() and lxc_cmd_get_name() both pass a nil pointer to
fill_sock_name(). Make sure that they are not dereferenced.

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

  Commit: e2b7b3ff6dc96514b006e88b2c4766eabc307e46
      https://github.com/lxc/lxc/commit/e2b7b3ff6dc96514b006e88b2c4766eabc307e46
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/commands.c

  Log Message:
  -----------
  commands: non-functional changes

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

  Commit: 916770247a0433d8e025b28ceb13d2be9943530d
      https://github.com/lxc/lxc/commit/916770247a0433d8e025b28ceb13d2be9943530d
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  lxccontainer: avoid NULL pointer dereference

In case the lxc command socket is hashed and the socket was created for a
different path than the one we're currently querying
lxc_cmd_get_{lxcpath,name}() can return NULL. The command socket path is hashed
when len(lxcpath) > sizeof(sun_path) - 2.

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

  Commit: 8cab92d486a82b62ecc66fe3f36933bf552c1c68
      https://github.com/lxc/lxc/commit/8cab92d486a82b62ecc66fe3f36933bf552c1c68
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/monitor.c

  Log Message:
  -----------
  monitor: simplify abstract socket logic

Older version of liblxc only allowed for 105 bytes to be used for the abstract
unix domain socket name because the code for our abstract unix socket handling
performed invalid checks. Since we \0-terminate we could now have a maximum of
106 chars. But do not break backwards compatibility we keep the limit at 105.

Reported-by: 0x0916 w at laoqinren.net
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: ec9be825c17e8bc8de609c1ede70fa4090fda190
      https://github.com/lxc/lxc/commit/ec9be825c17e8bc8de609c1ede70fa4090fda190
  Author: Evgeni Golov <evgeni at golov.de>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  precise is not the latest LTS, let's use xenial instead

  Commit: 2e6347d6720178fdb70bde0f500460be29a151a7
      https://github.com/lxc/lxc/commit/2e6347d6720178fdb70bde0f500460be29a151a7
  Author: 0x0916 <w at laoqinren.net>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M src/lxc/tools/lxc_top.c

  Log Message:
  -----------
  fix the wrong exit status

Signed-off-by: 0x0916 <w at laoqinren.net>

Compare: https://github.com/lxc/lxc/compare/814e9e3ab0c9...2e6347d67201