mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug23909'

Browse source
This commit is contained in:
Nick Mathewson 2018-02-15 20:56:23 -05:00
commit 92a42f795c
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug23909 Normal file
View file

@ -0,0 +1,4 @@
o Minor features (directory authority):
- Directory authorities now open their key-pinning files as O_SYNC,
to prevent themselves from accidentally writing partial lines.
Closes ticket 23909.

8
src/or/keypin.c
View file

@ -289,8 +289,7 @@ static int keypin_journal_fd = -1;
int
keypin_open_journal(const char *fname)
{
/* O_SYNC ??*/
int fd = tor_open_cloexec(fname, O_WRONLY|O_CREAT|O_BINARY, 0600);
int fd = tor_open_cloexec(fname, O_WRONLY|O_CREAT|O_BINARY|O_SYNC, 0600);
if (fd < 0)
goto err;
@ -417,10 +416,11 @@ keypin_load_journal_impl(const char *data, size_t size)
++n_entries;
}
int severity = (n_corrupt_lines || n_duplicates) ? LOG_WARN : LOG_INFO;
int severity = (n_corrupt_lines || n_duplicates) ? LOG_NOTICE : LOG_INFO;
tor_log(severity, LD_DIRSERV,
"Loaded %d entries from keypin journal. "
"Found %d corrupt lines, %d duplicates, and %d conflicts.",
"Found %d corrupt lines (ignored), %d duplicates (harmless), "
"and %d conflicts (resolved in favor or more recent entry).",
n_entries, n_corrupt_lines, n_duplicates, n_conflicts);
return 0;