Skip to content

Commit d02afc2

Browse files
authored
Merge pull request #1055 from libffi/fix/issue-1032-bounded-dlmmap
Fix unbounded executable mmap retries
2 parents 5f667d1 + e71a504 commit d02afc2

2 files changed

Lines changed: 63 additions & 12 deletions

File tree

‎src/closures.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -759,28 +759,22 @@ static struct
759759
#endif /* HAVE_MNTENT */
760760
};
761761

762+
#define OPEN_TEMP_EXEC_FILE_OPTS_COUNT \
763+
(sizeof (open_temp_exec_file_opts) / sizeof (*open_temp_exec_file_opts))
764+
762765
/* Current index into open_temp_exec_file_opts. */
763-
static int open_temp_exec_file_opts_idx = 0;
766+
static size_t open_temp_exec_file_opts_idx = 0;
764767

765768
/* Reset a current multi-call func, then advances to the next entry.
766-
If we're at the last, go back to the first and return nonzero,
767-
otherwise return zero. */
769+
Return nonzero after advancing past the last entry. */
768770
static int
769771
open_temp_exec_file_opts_next (void)
770772
{
771773
if (open_temp_exec_file_opts[open_temp_exec_file_opts_idx].repeat)
772774
open_temp_exec_file_opts[open_temp_exec_file_opts_idx].func (NULL);
773775

774776
open_temp_exec_file_opts_idx++;
775-
if (open_temp_exec_file_opts_idx
776-
== (sizeof (open_temp_exec_file_opts)
777-
/ sizeof (*open_temp_exec_file_opts)))
778-
{
779-
open_temp_exec_file_opts_idx = 0;
780-
return 1;
781-
}
782-
783-
return 0;
777+
return open_temp_exec_file_opts_idx == OPEN_TEMP_EXEC_FILE_OPTS_COUNT;
784778
}
785779

786780
/* Return a file descriptor of a temporary zero-sized file in a
@@ -790,6 +784,9 @@ open_temp_exec_file (void)
790784
{
791785
int fd;
792786

787+
if (open_temp_exec_file_opts_idx == OPEN_TEMP_EXEC_FILE_OPTS_COUNT)
788+
return -1;
789+
793790
do
794791
{
795792
fd = open_temp_exec_file_opts[open_temp_exec_file_opts_idx].func
@@ -873,6 +870,7 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
873870
if (!offset)
874871
{
875872
close (execfd);
873+
execfd = -1;
876874
goto retry_open;
877875
}
878876
if (ftruncate (execfd, offset) != 0)
@@ -885,6 +883,7 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
885883
return MFAIL;
886884
}
887885
else if (!offset
886+
&& open_temp_exec_file_opts_idx < OPEN_TEMP_EXEC_FILE_OPTS_COUNT
888887
&& open_temp_exec_file_opts[open_temp_exec_file_opts_idx].repeat)
889888
open_temp_exec_file_opts_next ();
890889

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/* Area: closures */
2+
/* { dg-do run { target x86_64-*-linux* } } */
3+
/* { dg-options "-Wl,--export-dynamic" { target x86_64-*-linux* } } */
4+
5+
#define _GNU_SOURCE 1
6+
#include "ffitest.h"
7+
8+
#include <dlfcn.h>
9+
#include <errno.h>
10+
#include <sys/mman.h>
11+
#include <unistd.h>
12+
13+
typedef void *(*mmap_fn) (void *, size_t, int, int, int, off_t);
14+
15+
static mmap_fn real_mmap;
16+
static int reject_exec_mappings;
17+
18+
/* Model a hardened runtime that rejects every executable mapping. */
19+
void *
20+
mmap (void *addr, size_t length, int prot, int flags, int fd, off_t offset)
21+
{
22+
if (reject_exec_mappings && (prot & PROT_EXEC))
23+
{
24+
errno = EPERM;
25+
return MAP_FAILED;
26+
}
27+
28+
return real_mmap (addr, length, prot, flags, fd, offset);
29+
}
30+
31+
int
32+
main (void)
33+
{
34+
ffi_closure *closure;
35+
void *code = NULL;
36+
37+
real_mmap = (mmap_fn) dlsym (RTLD_NEXT, "mmap");
38+
CHECK (real_mmap != NULL);
39+
40+
reject_exec_mappings = 1;
41+
42+
/* The failure path must terminate instead of cycling through temporary
43+
backing files forever. */
44+
alarm (5);
45+
closure = ffi_closure_alloc (sizeof (ffi_closure), &code);
46+
alarm (0);
47+
48+
CHECK (closure == NULL);
49+
CHECK (code == NULL);
50+
51+
exit (0);
52+
}

0 commit comments

Comments
 (0)