picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

selinux: relabel /run the same way as /dev after loading the policy since they both come pre-filled and unlabelled

Browse source
This commit is contained in:
Lennart Poettering 2011-04-04 16:56:51 +02:00
parent 9d8677dad2
commit 3bbecb2f2c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mount-setup.c
View file

@ -243,8 +243,10 @@ int mount_setup(void) {
* appropriate labels, after mounting. The other virtual API * appropriate labels, after mounting. The other virtual API
* file systems do not need. */ * file systems do not need. */
if (unlink("/dev/.systemd-relabel-devtmpfs") >= 0) if (unlink("/dev/.systemd-relabel-run-dev") >= 0) {
nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS); nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS);
}
/* Create a few default symlinks, which are normally created /* Create a few default symlinks, which are normally created
* bei udevd, but some scripts might need them before we start * bei udevd, but some scripts might need them before we start

8
src/selinux-setup.c
View file

@ -43,9 +43,9 @@ int selinux_setup(char *const argv[]) {
return 0; return 0;
/* Before we load the policy we create a flag file to ensure /* Before we load the policy we create a flag file to ensure
* that after the reexec we iterate through /dev to relabel * that after the reexec we iterate through /run and /dev to
* things. */ * relabel things. */
touch("/dev/.systemd-relabel-devtmpfs"); touch("/dev/.systemd-relabel-run-dev");
if (selinux_init_load_policy(&enforce) == 0) { if (selinux_init_load_policy(&enforce) == 0) {
log_debug("Successfully loaded SELinux policy, reexecuting."); log_debug("Successfully loaded SELinux policy, reexecuting.");
@ -60,7 +60,7 @@ int selinux_setup(char *const argv[]) {
} else { } else {
log_full(enforce > 0 ? LOG_ERR : LOG_WARNING, "Failed to load SELinux policy."); log_full(enforce > 0 ? LOG_ERR : LOG_WARNING, "Failed to load SELinux policy.");
unlink("/dev/.systemd-relabel-devtmpfs"); unlink("/dev/.systemd-relabel-run-dev");
if (enforce > 0) if (enforce > 0)
return -EIO; return -EIO;