diff options
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index 017c62308c1..f5e47428ef9 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -707,10 +707,12 @@ main (int argc, char **argv) bool disable_aslr = dumping; # endif - if (disable_aslr && disable_address_randomization ()) + if (disable_aslr && disable_address_randomization () + && !getenv ("EMACS_HEAP_EXEC")) { /* Set this so the personality will be reverted before execs - after this one. */ + after this one, and to work around an re-exec loop on buggy + kernels (Bug#32083). */ xputenv ("EMACS_HEAP_EXEC=true"); /* Address randomization was enabled, but is now disabled. |