shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

paranoia: refuse rm_rf("/")

Browse Source
This commit is contained in:
Lennart Poettering 2012-07-09 17:30:22 +02:00
parent 8401e9f91d
commit 461b182232
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -22,6 +22,10 @@ Bugfixes:
Features:
* refuse taking lower-case variable names in sd_journal_send() and friends.
* when running as user instance: implicitly default to WorkingDirectory=$HOME for all services.
* journalctl highlight reboots
* Merge KillUnit()'s mode and who params into one

2
src/journal/journald.c
View File

@ -2058,7 +2058,6 @@ static int system_journal_open(Server *s) {
}
static int server_flush_to_var(Server *s) {
char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
Object *o = NULL;
int r;
sd_id128_t machine;
@ -2135,6 +2134,7 @@ finish:
s->runtime_journal = NULL;
if (r >= 0) {
char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
sd_id128_to_string(machine, path + 17);
rm_rf(path, false, true, false);
}

3
src/shared/util.c
View File

@ -3339,6 +3339,9 @@ int rm_rf(const char *path, bool only_dirs, bool delete_root, bool honour_sticky
assert(path);
/* Be paranoid */
assert(!streq(path, "/"));
fd = open(path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME);
if (fd < 0) {