AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: Fix __closefrom_fallback iterates until max int (BZ#28993)

Browse Source 
The __closefrom_fallback tries to get a available file descriptor
if the initial open ("/proc/self/fd/", ...) fails.  It assumes the
failure would be only if procfs is not mount (ENOENT), however if
the the proc file is not accessible (due some other kernel filtering
such apparmor) it will iterate over a potentially large file set
issuing close calls.

It should only try the close fallback if open returns EMFILE,
ENFILE, or ENOMEM.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2022-03-23 17:40:01 -03:00
parent 3ee318c923
commit 053fe27343
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysdeps/unix/sysv/linux/closefrom_fallback.c
View File

@ -30,16 +30,16 @@
_Bool
__closefrom_fallback (int from, _Bool dirfd_fallback)
{
bool ret = false;
int dirfd = __open_nocancel (FD_TO_FILENAME_PREFIX, O_RDONLY | O_DIRECTORY,
0);
if (dirfd == -1)
{
/* The closefrom should work even when process can't open new files. */
if (errno == ENOENT || !dirfd_fallback)
goto err;
/* Return if procfs can not be opened for some reason. */
if ((errno != EMFILE && errno != ENFILE && errno != ENOMEM)
|| !dirfd_fallback)
return false;
/* The closefrom should work even when process can't open new files. */
for (int i = from; i < INT_MAX; i++)
{
int r = __close_nocancel (i);
@ -54,6 +54,7 @@ __closefrom_fallback (int from, _Bool dirfd_fallback)
}
char buffer[1024];
bool ret = false;
while (true)
{
ssize_t ret = __getdents64 (dirfd, buffer, sizeof (buffer));