a4a3e50a6338b5ed2b9e4b364f9c46c8727314dd
[AGL/meta-agl.git] / meta-security / recipes-core / systemd / systemd / 0003-tizen-smack-Handling-of-run-and-sys-fs-cgroup.patch
1 From 831d552a9589bb2b99c042d01672409efa3d94fc Mon Sep 17 00:00:00 2001
2 From: Michael Demeter <michael.demeter@intel.com>
3 Date: Fri, 11 Oct 2013 15:37:57 -0700
4 Subject: [PATCH 3/9] 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 | 12 ++++++++----
14  1 file changed, 8 insertions(+), 4 deletions(-)
15
16 diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
17 index 521545e..ba0867c 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            mac_smack_use, MNT_FATAL                  },
22          { "tmpfs",       "/dev/shm",                  "tmpfs",      "mode=1777,smackfsroot=*", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
23            mac_smack_use, 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 -          mac_smack_use, MNT_FATAL                  },
34 -#endif
35 +        { "tmpfs",      "/run",                      "tmpfs",      "mode=755,smackfstransmute=System::Run", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
36 +          mac_smack_use,  MNT_FATAL },
37 +        { "tmpfs",      "/sys/fs/cgroup",            "tmpfs",      "mode=755,smackfsroot=*", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME,
38 +          mac_smack_use,  MNT_IN_CONTAINER },
39 +#else
40          { "tmpfs",       "/run",                      "tmpfs",      "mode=755",                MS_NOSUID|MS_NODEV|MS_STRICTATIME,
41            NULL,          MNT_FATAL|MNT_IN_CONTAINER },
42          { "tmpfs",       "/sys/fs/cgroup",            "tmpfs",      "mode=755",                MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME,
43            NULL,          MNT_FATAL|MNT_IN_CONTAINER },
44 +#endif
45          { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,
46            NULL,          MNT_IN_CONTAINER           },
47          { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd",       MS_NOSUID|MS_NOEXEC|MS_NODEV,
48 -- 
49 1.8.4.5
50