From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7814) id 6EEAC384642B; Thu, 27 Oct 2022 20:50:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6EEAC384642B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666903813; bh=f7yTYhlvNi/FNeIiTmzmhfGA6VmMT7roKEemOS1O/do=; h=From:To:Subject:Date:From; b=ynYXsQr5APXJl3QOXbJLp6dGjsfVq/CQ9Y5SnY7eQUZA0DyCutYZalGHumIlYzVUl XGcD9pyOi2llNiHi7woQLkFADMtRLdR+vpuT/6NnNGJu0sTIfXhRaY5frxlO70zoWt 9kzx4j2PnJf6iD+1p8FGi7JCcNqKYQMo10cRokaE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Fangrui Song To: glibc-cvs@sourceware.org Subject: [glibc/google/grte/v5-2.27/master] nptl: Make mmap and munmap in thread stack allocation interposable X-Act-Checkin: glibc X-Git-Author: Nilay Vaish X-Git-Refname: refs/heads/google/grte/v5-2.27/master X-Git-Oldrev: 7255e947f2ee7700d0a2f4115f9598e2dd8f3c2c X-Git-Newrev: 16ca0733a06f551aca8a5ecd38bcb719c4a56634 Message-Id: <20221027205013.6EEAC384642B@sourceware.org> Date: Thu, 27 Oct 2022 20:50:13 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=16ca0733a06f551aca8a5ecd38bcb719c4a56634 commit 16ca0733a06f551aca8a5ecd38bcb719c4a56634 Author: Nilay Vaish Date: Thu Oct 27 11:33:49 2022 -0700 nptl: Make mmap and munmap in thread stack allocation interposable b/238021577: __mmap and __munmap are not interposable. Call interposable mmap and munmap instead so that we can capture thread stack allocations. Diff: --- nptl/allocatestack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 9f6a75695e..1989ca7c86 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -276,7 +276,7 @@ __free_stacks (size_t limit) /* Remove this block. This should never fail. If it does something is really wrong. */ - if (__munmap (curr->stackblock, curr->stackblock_size) != 0) + if (munmap (curr->stackblock, curr->stackblock_size) != 0) abort (); /* Maybe we have freed enough. */ @@ -558,7 +558,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, /* If a guard page is required, avoid committing memory by first allocate with PROT_NONE and then reserve with required permission excluding the guard page. */ - mem = __mmap (NULL, size, (guardsize == 0) ? prot : PROT_NONE, + mem = mmap (NULL, size, (guardsize == 0) ? prot : PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); if (__glibc_unlikely (mem == MAP_FAILED)) @@ -585,7 +585,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, pagesize_m1); if (setup_stack_prot (mem, size, guard, guardsize, prot) != 0) { - __munmap (mem, size); + munmap (mem, size); return errno; } } @@ -628,7 +628,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, assert (errno == ENOMEM); /* Free the stack memory we just allocated. */ - (void) __munmap (mem, size); + (void) munmap (mem, size); return errno; }