Mercurial > dropbear
changeset 983:2b62f26cf808
Open directories O_RDONLY for fsync, add debugging if it fails
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 04 Jan 2015 22:22:43 +0800 |
| parents | fd2e8bbb0333 |
| children | d46e7f613157 |
| files | gensignkey.c svr-kex.c |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gensignkey.c Sat Nov 08 22:15:16 2014 +0800 +++ b/gensignkey.c Sun Jan 04 22:22:43 2015 +0800 @@ -41,7 +41,9 @@ out: if (fd >= 0) { - fsync(fd); + if (fsync(fd) != 0) { + dropbear_log(LOG_ERR, "fsync of %s failed: %s", filename, strerror(errno)); + } m_close(fd); } return ret;
--- a/svr-kex.c Sat Nov 08 22:15:16 2014 +0800 +++ b/svr-kex.c Sun Jan 04 22:22:43 2015 +0800 @@ -91,12 +91,15 @@ #ifdef HAVE_LIBGEN_H char *fn_dir = m_strdup(fn); char *dir = dirname(fn_dir); - /* some OSes need the fd to be writable for fsync */ - int dirfd = open(dir, O_RDWR); + int dirfd = open(dir, O_RDONLY); if (dirfd != -1) { - fsync(dirfd); + if (fsync(dirfd) != 0) { + TRACE(("fsync of directory %s failed: %s", dir, strerror(errno))) + } m_close(dirfd); + } else { + TRACE(("error opening directory %s for fsync: %s", dir, strerror(errno))) } free(fn_dir);