isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only use closefrom_fallback() if no better method exists.

Browse Source 
The previous logic was too fragile.
This commit is contained in:
Todd C. Miller
2018-11-08 15:17:39 -07:00
parent 733669ec38
commit 537a2f9773
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/util/closefrom.c
View File

@@ -43,15 +43,11 @@
# define _POSIX_OPEN_MAX 20 # define _POSIX_OPEN_MAX 20
#endif #endif
#if defined(HAVE_FCNTL_CLOSEM) && !defined(HAVE_DIRFD)
# define sudo_closefrom closefrom_fallback
#endif
/* /*
* Close all file descriptors greater than or equal to lowfd. * Close all file descriptors greater than or equal to lowfd.
* This is the expensive (fallback) method. * This is the expensive (fallback) method.
*/ */
void static void
closefrom_fallback(int lowfd) closefrom_fallback(int lowfd)
{ {
long fd, maxfd; long fd, maxfd;
@@ -131,5 +127,12 @@ sudo_closefrom(int lowfd)
} else } else
closefrom_fallback(lowfd); closefrom_fallback(lowfd);
} }
#else
void
sudo_closefrom(int lowfd)
{
closefrom_fallback(lowfd);
}
#endif /* HAVE_FCNTL_CLOSEM */ #endif /* HAVE_FCNTL_CLOSEM */
#endif /* HAVE_CLOSEFROM */ #endif /* HAVE_CLOSEFROM */