d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use funlinkat in pidfile to ensure we are removing the right file.

Browse Source
This commit is contained in:
Mariusz Zaborski 2019-04-06 11:24:43 +00:00
parent a489026566
commit 8a9e93bb21
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libutil/pidfile.c
View File

@ -293,8 +293,11 @@ _pidfile_remove(struct pidfh *pfh, int freeit)
return (-1); return (-1);
} }
if (unlinkat(pfh->pf_dirfd, pfh->pf_filename, 0) == -1) if (funlinkat(pfh->pf_dirfd, pfh->pf_filename, pfh->pf_fd, 0) == -1) {
if (errno == EDEADLK)
return (-1);
error = errno; error = errno;
}
if (close(pfh->pf_fd) == -1 && error == 0) if (close(pfh->pf_fd) == -1 && error == 0)
error = errno; error = errno;
if (close(pfh->pf_dirfd) == -1 && error == 0) if (close(pfh->pf_dirfd) == -1 && error == 0)