oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5: Fix fcc_open() FD leak

Browse Source
This commit is contained in:
Nicolas Williams
2019-12-06 23:06:57 -06:00
parent d4a319d57d
commit 90a59a064b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/krb5/fcache.c
View File

@@ -412,10 +412,15 @@ fcc_open(krb5_context context,
if ((flags & O_EXCL)) { if ((flags & O_EXCL)) {
flags &= ~O_EXCL; flags &= ~O_EXCL;
/*
* FIXME Instead of mkostemp()... we could instead try to use a .new
* file... with care. Or the O_TMPFILE / linkat() extensions. We need
* a roken / heimbase abstraction for that.
*/
if (asprintf(&TMPFILENAME(id), "%s-XXXXXX", FILENAME(id)) < 0 || if (asprintf(&TMPFILENAME(id), "%s-XXXXXX", FILENAME(id)) < 0 ||
TMPFILENAME(id) == NULL) TMPFILENAME(id) == NULL)
return krb5_enomem(context); return krb5_enomem(context);
if ((*fd_ret = mkostemp(TMPFILENAME(id), O_CLOEXEC)) == -1) { if ((fd = mkostemp(TMPFILENAME(id), O_CLOEXEC)) == -1) {
free(TMPFILENAME(id)); free(TMPFILENAME(id));
TMPFILENAME(id) = NULL; TMPFILENAME(id) = NULL;
krb5_set_error_message(context, ret = errno, krb5_set_error_message(context, ret = errno,
@@ -423,6 +428,7 @@ fcc_open(krb5_context context,
FILENAME(id)); FILENAME(id));
return ret; return ret;
} }
goto out;
} }
filename = TMPFILENAME(id) ? TMPFILENAME(id) : FILENAME(id); filename = TMPFILENAME(id) ? TMPFILENAME(id) : FILENAME(id);
@@ -535,6 +541,7 @@ again:
#endif #endif
} }
out:
if((ret = fcc_lock(context, id, fd, exclusive)) != 0) { if((ret = fcc_lock(context, id, fd, exclusive)) != 0) {
close(fd); close(fd);
return ret; return ret;