[lxc-devel] [lxc/lxc] 327cce: conf: fix run_script_argv()

GitHub noreply at github.com
Sat Feb 17 00:51:57 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 327cce76ad2f435e84b7d53e64a1e0a5edbd568b
      https://github.com/lxc/lxc/commit/327cce76ad2f435e84b7d53e64a1e0a5edbd568b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: fix run_script_argv()

Make sure that we allocate the buffer **after** we determined how much space we
need in total.
This fixes a SIGBUS/SIGSEGV Stéphane reported on aarch64 and armf.

Reported-by: Stéphane Graber <stgraber at ubuntu.com>
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 6f8d00d27964e548f66218408515993814bdd37f
      https://github.com/lxc/lxc/commit/6f8d00d27964e548f66218408515993814bdd37f
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: use malloc() in run_script_argv()

It seems dangerous to use alloca() as the arguments can be of indeterminate
length and we might blow up the stack.

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


  Commit: 586b1ce72bc8a262b508109b6ad0a062c1ea9819
      https://github.com/lxc/lxc/commit/586b1ce72bc8a262b508109b6ad0a062c1ea9819
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: s/argsin/argv/ in run_script_argv()

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


  Commit: 0d0d3655167f9658d0e19f775cfd20cdc52cd906
      https://github.com/lxc/lxc/commit/0d0d3655167f9658d0e19f775cfd20cdc52cd906
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  start: don't call close on invalid file descriptor

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


  Commit: c06a0555e9cea7984eb1584c82ba310c2924956f
      https://github.com/lxc/lxc/commit/c06a0555e9cea7984eb1584c82ba310c2924956f
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2018-02-17 (Sat, 17 Feb 2018)

  Changed paths:
    M src/lxc/console.c

  Log Message:
  -----------
  console: ensure that fd is marked EBADF

If the handler closes the file descriptor for the peer or master fd it is
crucial that we mark it as -EBADF. This will prevent lxc_console_delete()
from calling close() on an already closed file descriptor again. I've
observed the double close in the attach code.

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


  Commit: 3d7868ae53a3ddab1b1494c4ce7da286b0976f6d
      https://github.com/lxc/lxc/commit/3d7868ae53a3ddab1b1494c4ce7da286b0976f6d
  Author: Serge Hallyn <serge at hallyn.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M src/lxc/conf.c
    M src/lxc/console.c
    M src/lxc/start.c

  Log Message:
  -----------
  Merge pull request #2171 from brauner/2018-02-16/rework_hooks

conf: fix run_script_argv()


Compare: https://github.com/lxc/lxc/compare/941138edbab1...3d7868ae53a3


More information about the lxc-devel mailing list