diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2017-08-03 18:19:56 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2017-09-28 15:02:34 +0000 |
| commit | dd35f9f41aba6f51178986d36ec29206d6025757 (patch) | |
| tree | c4fb07b811c268cd15e87093cf51597a64f8a460 /usr/src/uts/common/exec | |
| parent | 5ae84a5233b723c890288b775cb5317db2e54d61 (diff) | |
| download | illumos-joyent-dd35f9f41aba6f51178986d36ec29206d6025757.tar.gz | |
OS-6323 want stack-clash mitigation
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Alex Wilson <alex.wilson@joyent.com>
Approved by: Alex Wilson <alex.wilson@joyent.com>
Diffstat (limited to 'usr/src/uts/common/exec')
| -rw-r--r-- | usr/src/uts/common/exec/elf/elf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/uts/common/exec/elf/elf.c b/usr/src/uts/common/exec/elf/elf.c index 23c198897d..023d027789 100644 --- a/usr/src/uts/common/exec/elf/elf.c +++ b/usr/src/uts/common/exec/elf/elf.c @@ -26,7 +26,7 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* - * Copyright 2016 Joyent, Inc. + * Copyright 2017 Joyent, Inc. */ #include <sys/types.h> @@ -2355,6 +2355,10 @@ top: void *tmp = NULL; extern struct seg_ops segspt_shmops; + if ((seg->s_flags & S_HOLE) != 0) { + continue; + } + for (saddr = seg->s_base; saddr < eaddr; saddr = naddr) { uint_t prot; size_t size; |