meta-security/recipes-core/systemd/systemd/0003-tizen-smack-Handling-of-run-and-sys-fs-cgroup-v216.patch

   1 From da574755b8abe1d5fb9151f901ccea51d40d9509 Mon Sep 17 00:00:00 2001
   2 From: Michael Demeter <michael.demeter@intel.com>
   3 Date: Fri, 30 Oct 2015 11:25:50 +0100
   4 Subject: [PATCH] tizen-smack: Handling of /run and /sys/fs/cgroup
   5
   6 Make /run a transmuting directory to enable systemd
   7 communications with services in the User domain.
   8
   9 Upstream-Status: Pending
  10
  11 Change-Id: I9e23b78d17a108d8e56ad85a9e839b6ccbe4feff
  12 ---
  13  src/core/mount-setup.c | 10 +++++++---
  14  1 file changed, 7 insertions(+), 3 deletions(-)
  15
  16 diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
  17 index cc2633e..3dc7cd7 100644
  18 --- a/src/core/mount-setup.c
  19 +++ b/src/core/mount-setup.c
  20 @@ -85,19 +85,23 @@ static const MountPoint mount_table[] = {
  21            use_smack,  MNT_FATAL },
  22          { "tmpfs",      "/dev/shm",                  "tmpfs",      "mode=1777,smackfsroot=*", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
  23            use_smack,  MNT_FATAL },
  24 -#endif
  25 +#else
  26          { "tmpfs",      "/dev/shm",                  "tmpfs",      "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
  27            NULL,       MNT_FATAL|MNT_IN_CONTAINER },
  28 +#endif
  29          { "devpts",     "/dev/pts",                  "devpts",     "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC,
  30            NULL,       MNT_IN_CONTAINER },
  31  #ifdef HAVE_SMACK
  32 -        { "tmpfs",      "/run",                      "tmpfs",      "mode=755,smackfsroot=*", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
  33 +        { "tmpfs",      "/run",                      "tmpfs",      "mode=755,smackfstransmute=System::Run", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
  34            use_smack,  MNT_FATAL },
  35 -#endif
  36 +        { "tmpfs",      "/sys/fs/cgroup",            "tmpfs",      "mode=755,smackfsroot=*", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME,
  37 +          use_smack,  MNT_IN_CONTAINER },
  38 +#else
  39          { "tmpfs",      "/run",                      "tmpfs",      "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
  40            NULL,       MNT_FATAL|MNT_IN_CONTAINER },
  41          { "tmpfs",      "/sys/fs/cgroup",            "tmpfs",      "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME,
  42            NULL,       MNT_FATAL|MNT_IN_CONTAINER },
  43 +#endif
  44          { "cgroup",     "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,
  45            NULL,       MNT_IN_CONTAINER },
  46          { "cgroup",     "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV,
  47 --
  48 2.1.4
  49