david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oslib-posix: Use MAP_STACK in qemu_alloc_stack() on OpenBSD

Browse Source 
Use MAP_STACK in qemu_alloc_stack() on OpenBSD.

Added to our 6.4 release.

MAP_STACK      Indicate that the mapping is used as a stack.  This
               flag must be used in combination with MAP_ANON and
               MAP_PRIVATE.

Implement MAP_STACK option for mmap().  Synchronous faults (pagefault and
syscall) confirm the stack register points at MAP_STACK memory, otherwise
SIGSEGV is delivered. sigaltstack() and pthread_attr_setstack() are modified
to create a MAP_STACK sub-region which satisfies alignment requirements.
Observe that MAP_STACK can only be set/cleared by mmap(), which zeroes the
contents of the region -- there is no mprotect() equivalent operation, so
there is no MAP_STACK-adding gadget.

Signed-off-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Kamil Rytarowski <n54@gmx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20181019125239.GA13884@humpty.home.comstyle.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Brad Smith 2018-10-19 08:52:39 -04:00 committed by Peter Maydell
parent 03c1ca1c51
commit fc3d1bad1e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/oslib-posix.c
View File

@ -596,6 +596,7 @@ pid_t qemu_fork(Error **errp)
void *qemu_alloc_stack(size_t *sz) void *qemu_alloc_stack(size_t *sz)
{ {
void *ptr, *guardpage; void *ptr, *guardpage;
int flags;
#ifdef CONFIG_DEBUG_STACK_USAGE #ifdef CONFIG_DEBUG_STACK_USAGE
void *ptr2; void *ptr2;
#endif #endif
@ -610,8 +611,18 @@ void *qemu_alloc_stack(size_t *sz)
/* allocate one extra page for the guard page */ /* allocate one extra page for the guard page */
*sz += pagesz; *sz += pagesz;
ptr = mmap(NULL, *sz, PROT_READ | PROT_WRITE, flags = MAP_PRIVATE | MAP_ANONYMOUS;
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); #if defined(MAP_STACK) && defined(__OpenBSD__)
/* Only enable MAP_STACK on OpenBSD. Other OS's such as
* Linux/FreeBSD/NetBSD have a flag with the same name
* but have differing functionality. OpenBSD will SEGV
* if it spots execution with a stack pointer pointing
* at memory that was not allocated with MAP_STACK.
*/
flags |= MAP_STACK;
#endif
ptr = mmap(NULL, *sz, PROT_READ | PROT_WRITE, flags, -1, 0);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
perror("failed to allocate memory for stack"); perror("failed to allocate memory for stack");
abort(); abort();