shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 11:55:44 +03:00
Code

tmpfiles: ensure we do no follow symlinks when cleaning up dirs

Browse Source 
Patch suggested by Miloslav Trmac.
This commit is contained in:
Lennart Poettering 2010-12-28 14:20:21 +01:00
parent 5b8191986c
commit a247755d52
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tmpfiles.c
View File

@ -149,7 +149,7 @@ static int dir_cleanup(
DIR *sub_dir;
int q;
sub_dir = xopendirat(dirfd(d), dent->d_name);
sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW);
if (sub_dir == NULL) {
if (errno != ENOENT) {
log_error("opendir(%s/%s) failed: %m", p, dent->d_name);

4
src/util.c
View File

@ -3402,8 +3402,8 @@ bool null_or_empty(struct stat *st) {
return false;
}
DIR *xopendirat(int fd, const char *name) {
return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC));
DIR *xopendirat(int fd, const char *name, int flags) {
return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags));
}
int signal_from_string_try_harder(const char *s) {

2
src/util.h
View File

@ -363,7 +363,7 @@ _noreturn_ void freeze(void);
bool null_or_empty(struct stat *st);
DIR *xopendirat(int dirfd, const char *name);
DIR *xopendirat(int dirfd, const char *name, int flags);
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
void dual_timestamp_deserialize(const char *value, dual_timestamp *t);