ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

charon: Explicitly check return value of fileno() 

This is mainly for Coverity because fchown() can't take a negative
value, which the -1 check implies is possible.
This commit is contained in:
Tobias Brunner 2017-11-15 14:35:42 +01:00
parent be79839ea7
commit 42353849cb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/charon-tkm/src/charon-tkm.c
View File

@ -211,7 +211,12 @@ static bool check_pidfile()
int fd;
fd = fileno(pidfile);
if (fd == -1 || fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
if (fd == -1)
{
DBG1(DBG_DMN, "unable to determine fd for '%s'", pidfile_name);
return TRUE;
}
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
{
DBG1(DBG_LIB, "setting FD_CLOEXEC for '%s' failed: %s",
pidfile_name, strerror(errno));

7
src/charon/charon.c
View File

@ -221,7 +221,12 @@ static bool check_pidfile()
int fd;
fd = fileno(pidfile);
if (fd == -1 || fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
if (fd == -1)
{
DBG1(DBG_DMN, "unable to determine fd for '"PID_FILE"'");
return TRUE;
}
if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
{
DBG1(DBG_LIB, "setting FD_CLOEXEC for '"PID_FILE"' failed: %s",
strerror(errno));