nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

When using open() to make sure we created a dir, close the fd afterwards

Browse Source 
Found by coverity. Not in any released Tor. Fixes CID 1355640.

Also, don't check for fd correctness with assert(fd).  You need to
assert (fd >= 0).
This commit is contained in:
Nick Mathewson 2016-03-14 13:02:50 -04:00
parent a64be7eaa9
commit 36ad65a7d1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/util.c
View File

@ -2114,7 +2114,10 @@ check_private_dir(const char *dirname, cpd_check_t check,
* permissions on the directory will be checked again below.*/
fd = open(sandbox_intern_string(dirname), O_NOFOLLOW);
if ( fd == -1 ) return -1;
if (fd == -1)
return -1;
else
close(fd);
} else if (!(check & CPD_CHECK)) {
log_warn(LD_FS, "Directory %s does not exist.", dirname);
@ -2126,7 +2129,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
return 0;
}
tor_assert(fd);
tor_assert(fd >= 0);
//f = tor_strdup(dirname);
//clean_name_for_stat(f);