hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jira bug MAX-248 File descriptor leak in secrets key reading

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-10 08:06:48 +01:00
parent 28921e0856
commit 344fcfa9ea
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/secrets.c
View File

@ -107,6 +107,7 @@ int len;
if (fstat(fd, &secret_stats) < 0) { if (fstat(fd, &secret_stats) < 0) {
int eno = errno; int eno = errno;
errno = 0; errno = 0;
close(fd);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : fstat for secret file %s " "Error : fstat for secret file %s "
@ -121,6 +122,7 @@ int len;
{ {
int eno = errno; int eno = errno;
errno = 0; errno = 0;
close(fd);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Secrets file %s has " "Error : Secrets file %s has "
@ -132,6 +134,7 @@ int len;
} }
if (secret_stats.st_mode != (S_IRUSR|S_IFREG)) if (secret_stats.st_mode != (S_IRUSR|S_IFREG))
{ {
close(fd);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Ignoring secrets file " "Error : Ignoring secrets file "
@ -142,6 +145,7 @@ int len;
if ((keys = (MAXKEYS *)malloc(sizeof(MAXKEYS))) == NULL) if ((keys = (MAXKEYS *)malloc(sizeof(MAXKEYS))) == NULL)
{ {
close(fd);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Memory allocation failed " "Error : Memory allocation failed "
@ -159,6 +163,7 @@ int len;
{ {
int eno = errno; int eno = errno;
errno = 0; errno = 0;
close(fd);
free(keys); free(keys);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
@ -274,7 +279,10 @@ int enlen;
keys = secrets_readKeys(); keys = secrets_readKeys();
if (!keys) if (!keys)
return strdup(crypt); return strdup(crypt);
/* If the input is not a HEX string return the input - it probably was not encrypted */ /*
** If the input is not a HEX string return the input
** it probably was not encrypted
*/
for (ptr = crypt; *ptr; ptr++) for (ptr = crypt; *ptr; ptr++)
{ {
if (!isxdigit(*ptr)) if (!isxdigit(*ptr))