shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-31 16:21:26 +03:00
Code

journal-file: add O_NONBLOCK for paranoia when opening journal files

Browse Source
This commit is contained in:
Lennart Poettering 2018-02-19 17:37:47 +01:00
parent 8d6a4d33e1
commit 817b1c5b1e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/journal/journal-file.c
View File

@ -3298,6 +3298,8 @@ int journal_file_open(
goto fail;
}
} else {
assert(fd >= 0);
/* If we don't know the path, fill in something explanatory and vaguely useful */
if (asprintf(&f->path, "/proc/self/%i", fd) < 0) {
r = -ENOMEM;
@ -3312,7 +3314,11 @@ int journal_file_open(
}
if (f->fd < 0) {
f->fd = open(f->path, f->flags|O_CLOEXEC, f->mode);
/* We pass O_NONBLOCK here, so that in case somebody pointed us to some character device node or FIFO
* or so, we likely fail quickly than block for long. For regular files O_NONBLOCK has no effect, hence
* it doesn't hurt in that case. */
f->fd = open(f->path, f->flags|O_CLOEXEC|O_NONBLOCK, f->mode);
if (f->fd < 0) {
r = -errno;
goto fail;
@ -3320,6 +3326,10 @@ int journal_file_open(
/* fds we opened here by us should also be closed by us. */
f->close_fd = true;
r = fd_nonblock(f->fd, false);
if (r < 0)
goto fail;
}
f->cache_fd = mmap_cache_add_fd(f->mmap, f->fd);