[lxc-devel] [lxc/lxc] 8348e4: config: Fix parsing of mount options

Christian Brauner noreply at github.com
Sat Dec 7 15:52:16 UTC 2019


  Branch: refs/heads/stable-3.0
  Home:   https://github.com/lxc/lxc
  Commit: 8348e4246d0ee19f66e45eda8e3accd50d139d60
      https://github.com/lxc/lxc/commit/8348e4246d0ee19f66e45eda8e3accd50d139d60
  Author: Maximilian Blenk <Maximilian.Blenk at bmw.de>
  Date:   2019-12-07 (Sat, 07 Dec 2019)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  config: Fix parsing of mount options

When parsing mount options e.g. from lxc.mount.entry the specified
options are mapped to the flags constants. To do so, the strings
are compared to the options contained in mount_opt. However,
when comparing the strings, the length of the string is not
checked. That entails that the option "rootcontext=selinux-context"
is mapped to the mount option read-only (ro). This commit fixes
this issue by checking if a '=' is contained in the specified option
and additionally comparing the length of the strings.

Signed-off-by: Maximilian Blenk <Maximilian.Blenk at bmw.de>


  Commit: a0a707e2aa90cd2dd3eef35d676a5b5dfa0ef42c
      https://github.com/lxc/lxc/commit/a0a707e2aa90cd2dd3eef35d676a5b5dfa0ef42c
  Author: Rachid Koucha <47061324+Rachid-Koucha at users.noreply.github.com>
  Date:   2019-12-07 (Sat, 07 Dec 2019)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  Init "busy" field to -1 as 0 is valid fd

"busy" field is assigned with the command socket descriptor when the terminal is in use. So, use "-1" to disable it.
Signed-off-by: Rachid Koucha <rachid.koucha at gmail.com>


  Commit: 1bcae9fb23f2c7b5511fef47a8986036b1871931
      https://github.com/lxc/lxc/commit/1bcae9fb23f2c7b5511fef47a8986036b1871931
  Author: Rachid Koucha <47061324+Rachid-Koucha at users.noreply.github.com>
  Date:   2019-12-07 (Sat, 07 Dec 2019)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  "busy" field set to 1 instead of 0

"busy" field is assigned with the command socket descriptor when the terminal is in use. So, use "-1" to disable it.

Signed-off-by: Rachid Koucha <rachid.koucha at gmail.com>


  Commit: 64b23e10cfe27c4cb3d86f783050144dcbc8b1c7
      https://github.com/lxc/lxc/commit/64b23e10cfe27c4cb3d86f783050144dcbc8b1c7
  Author: Rachid Koucha <47061324+Rachid-Koucha at users.noreply.github.com>
  Date:   2019-12-07 (Sat, 07 Dec 2019)

  Changed paths:
    M src/lxc/terminal.c

  Log Message:
  -----------
  "busy" field set to -1 instead of 0

"busy" field is assigned with the command socket descriptor when the terminal is in use. So, use "-1" to disable it.

Signed-off-by: Rachid Koucha <rachid.koucha at gmail.com>


  Commit: 4c3a47db9eb48e3b2ccfe153a6a998d83c3bfc3d
      https://github.com/lxc/lxc/commit/4c3a47db9eb48e3b2ccfe153a6a998d83c3bfc3d
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2019-12-07 (Sat, 07 Dec 2019)

  Changed paths:
    M src/lxc/cgroups/cgfsng.c
    M src/lxc/cgroups/cgroup.c
    M src/lxc/cgroups/cgroup.h
    M src/lxc/lxccontainer.c
    M src/lxc/macro.h
    M src/lxc/start.c
    M src/lxc/start.h

  Log Message:
  -----------
  cgroup2: rework controller delegation

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


Compare: https://github.com/lxc/lxc/compare/df5f3618851b...4c3a47db9eb4


More information about the lxc-devel mailing list