[lxc-devel] [lxc/lxc] ec5000: Fix mount_entry_on_generic()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: ec50007fc2c90016a725b0a0ef329c039ad98265
      https://github.com/lxc/lxc/commit/ec50007fc2c90016a725b0a0ef329c039ad98265
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M src/lxc/bdev/lxcoverlay.c
    M src/lxc/conf.c

  Log Message:
  -----------
  Fix mount_entry_on_generic()

In mount_entry_on_generic() we dereferenced a NULL pointer whenever a container
without a rootfs was created. (Since mount_entry_on_systemfs() passes them with
NULL.) We have mount_entry_on_generic() check whether rootfs != NULL.

We also check whether rootfs != NULL in the functions ovl_mkdir() and
mount_entry_create_aufs_dirs() and bail immediately. Rationale: For overlay and
aufs lxc.mount.entry entries users give us absolute paths to e.g. workdir and
upperdir which we create for them. We currently use rootfs->path and the
lxcpath for the container to check that users give us a sane path to create
those directories under and refuse if they do not. If we want to allow overlay
mounts for containers without a rootfs they can easily be reworked.

Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>


  Commit: cefbc615acbed57809f4b254e33ef34e0847f665
      https://github.com/lxc/lxc/commit/cefbc615acbed57809f4b254e33ef34e0847f665
  Author: Serge Hallyn <serge at hallyn.com>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M src/lxc/bdev/lxcoverlay.c
    M src/lxc/conf.c

  Log Message:
  -----------
  Merge pull request #797 from brauner/2016-02-02/fix_execute_null_ptr_deref

Fix mount_entry_on_generic()


Compare: https://github.com/lxc/lxc/compare/5e75dea27b48...cefbc615acbe