[lxc-devel] [lxc/lxc] f02135: conf: order mount options

[GitHub]

  Branch: refs/heads/stable-1.0
  Home:   https://github.com/lxc/lxc
  Commit: f0213547b5815d01665e01f0228f9695e442f445
      https://github.com/lxc/lxc/commit/f0213547b5815d01665e01f0228f9695e442f445
  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: 962671592ea78c9a179f7289bde5ee4fd5d7b63a
      https://github.com/lxc/lxc/commit/962671592ea78c9a179f7289bde5ee4fd5d7b63a
  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: 62053667c79ba7bcf83569bdd8bf2ed2714fe9e4
      https://github.com/lxc/lxc/commit/62053667c79ba7bcf83569bdd8bf2ed2714fe9e4
  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: 107fd8bf87b1b00f30a1c506c02887d8d4814af7
      https://github.com/lxc/lxc/commit/107fd8bf87b1b00f30a1c506c02887d8d4814af7
  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>


Compare: https://github.com/lxc/lxc/compare/77a4cce1672b...107fd8bf87b1