Update log.c to Solve High CodeQL alert Time-of-check time-of-use filesystem race condition
Fixes a bug found in how log files worked. Feel free to make any changes.
This commit is contained in:
parent
3e1c2d5456
commit
4967b25b95
11
os/log.c
11
os/log.c
|
@ -178,10 +178,10 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
|
||||||
if (asprintf(&logFileName, fname, idstring) == -1)
|
if (asprintf(&logFileName, fname, idstring) == -1)
|
||||||
FatalError("Cannot allocate space for the log file name\n");
|
FatalError("Cannot allocate space for the log file name\n");
|
||||||
|
|
||||||
if (backup && *backup) {
|
int fd = open(logFileName, O_RDWR | O_NOFOLLOW);Add commentMore actions
|
||||||
|
if (fd != -1) {
|
||||||
struct stat buf;
|
struct stat buf;
|
||||||
|
if (fstat(fd, &buf) == 0 && S_ISREG(buf.st_mode)) {
|
||||||
if (!stat(logFileName, &buf) && S_ISREG(buf.st_mode)) {
|
|
||||||
char *suffix;
|
char *suffix;
|
||||||
char *oldLog;
|
char *oldLog;
|
||||||
|
|
||||||
|
@ -191,12 +191,15 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
|
||||||
}
|
}
|
||||||
free(suffix);
|
free(suffix);
|
||||||
|
|
||||||
if (rename(logFileName, oldLog) == -1) {
|
if (renameat(AT_FDCWD, logFileName, AT_FDCWD, oldLog) == -1) {
|
||||||
FatalError("Cannot move old log file \"%s\" to \"%s\"\n",
|
FatalError("Cannot move old log file \"%s\" to \"%s\"\n",
|
||||||
logFileName, oldLog);
|
logFileName, oldLog);
|
||||||
}
|
}
|
||||||
free(oldLog);
|
free(oldLog);
|
||||||
}
|
}
|
||||||
|
free(oldLog);
|
||||||
|
close(fd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (remove(logFileName) != 0 && errno != ENOENT) {
|
if (remove(logFileName) != 0 && errno != ENOENT) {
|
||||||
|
|
Loading…
Reference in New Issue