Received: from eggs.gnu.org ([2001:4830:134:3::10]:53923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJniK-0007ct-W4 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 17:51:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJnc9-0004se-LJ for qemu-devel@nongnu.org; Mon, 05 Nov 2018 17:45:02 -0500 Received: from speedy.comstyle.com ([206.51.28.2]:42911 helo=mail.comstyle.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gJnc9-0004H7-Ap for qemu-devel@nongnu.org; Mon, 05 Nov 2018 17:44:57 -0500 Received: from mail.comstyle.com (localhost [127.0.0.1]) by mail.comstyle.com (Postfix) with ESMTP id 42pnmS1fSNz4glt for ; Mon, 5 Nov 2018 17:44:24 -0500 (EST) Received: from [192.168.180.2] (toroon0812w-lp140-01-64-229-15-172.dsl.bell.ca [64.229.15.172]) (using TLSv1.2 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: brad) by mail.comstyle.com (Postfix) with ESMTPSA id 42pnmS0hQ2z4gls for ; Mon, 5 Nov 2018 17:44:24 -0500 (EST) From: Brad Smith References: <20181019125239.GA13884@humpty.home.comstyle.com> Message-ID: <1aee9b00-dd53-4e10-e56d-dc0c5628edec@comstyle.com> Date: Mon, 5 Nov 2018 17:44:33 -0500 MIME-Version: 1.0 In-Reply-To: <20181019125239.GA13884@humpty.home.comstyle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Qemu-devel] [PATCH v3] oslib-posix: Use MAP_STACK in qemu_alloc_stack() on OpenBSD List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ping. On 10/19/2018 8:52 AM, Brad Smith wrote: > 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 > Reviewed-by: Kamil Rytarowski > Reviewed-by: Peter Maydell > > diff --git a/util/oslib-posix.c b/util/oslib-posix.c > index fbd0dc8c57..c1bee2a581 100644 > --- a/util/oslib-posix.c > +++ b/util/oslib-posix.c > @@ -596,6 +596,7 @@ pid_t qemu_fork(Error **errp) > void *qemu_alloc_stack(size_t *sz) > { > void *ptr, *guardpage; > + int flags; > #ifdef CONFIG_DEBUG_STACK_USAGE > void *ptr2; > #endif > @@ -610,8 +611,18 @@ void *qemu_alloc_stack(size_t *sz) > /* allocate one extra page for the guard page */ > *sz += pagesz; > > - ptr = mmap(NULL, *sz, PROT_READ | PROT_WRITE, > - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + flags = MAP_PRIVATE | MAP_ANONYMOUS; > +#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) { > perror("failed to allocate memory for stack"); > abort(); >