upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-13 23:10:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

4473. [bug] Only call fsync / _commit on regular files. [RT #43196]

Browse source 
(cherry picked from commit fe4d0fbc7c)
This commit is contained in:
Mark Andrews 2016-10-05 12:20:02 +11:00
parent 6c6a5f8e71
commit c99efbfa1b
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,3 +1,5 @@
4473. [bug] Only call fsync / _commit on regular files. [RT #43196]
4472. [bug] Named could fail to find the correct NSEC3 records when
a zone was updated between looking for the answer and
looking for the NSEC3 records proving non-existance

14
lib/isc/unix/stdio.c
View file

@ -137,14 +137,20 @@ isc_stdio_flush(FILE *f) {
isc_result_t
isc_stdio_sync(FILE *f) {
struct stat buf;
int r;
r = fsync(fileno(f));
if (fstat(fileno(f), &buf) != 0)
return (isc__errno2result(errno));
/*
* fsync is not supported on sockets and pipes which
* result in EINVAL / ENOTSUP.
* Only call fsync() on regular files.
*/
if (r == 0 || errno == EINVAL || errno == ENOTSUP)
if ((buf.st_mode & S_IFMT) != S_IFREG)
return (ISC_R_SUCCESS);
r = fsync(fileno(f));
if (r == 0)
return (ISC_R_SUCCESS);
else
return (isc__errno2result(errno));

13
lib/isc/win32/stdio.c
View file

@ -25,6 +25,9 @@
#include <isc/stdio.h>
#include <isc/util.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "errno2result.h"
isc_result_t
@ -133,8 +136,18 @@ isc_stdio_flush(FILE *f) {
isc_result_t
isc_stdio_sync(FILE *f) {
struct _stat buf;
int r;
if (_fstat(_fileno(f), &buf) != 0)
return (isc__errno2result(errno));
/*
* Only call _commit() on regular files.
*/
if ((buf.st_mode & S_IFMT) != S_IFREG)
return (ISC_R_SUCCESS);
r = _commit(_fileno(f));
if (r == 0)
return (ISC_R_SUCCESS);