mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-03 04:01:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hurd: Fix sbrk beyond 128MB

Browse Source
This commit is contained in:
Samuel Thibault 2012-05-10 15:31:37 -07:00 committed by Roland McGrath
parent 37ed8b9bdc
commit 1043890b10
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/brk.c (_hurd_set_brk): When more space needs to be
allocated, call __vm_protect to finish enabling the existing space, and
pass a copy of _hurd_data_end instead of PAGEBRK to __vm_allocate to
allocate the remainder.
2012-05-10 Pino Toscano <toscano.pino@tiscali.it>
* sysdeps/mach/hurd/recvfrom.c (__recvfrom): Check also for a null

20
sysdeps/mach/hurd/brk.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,93,94,95,96,97,99,2000 Free Software Foundation, Inc.
/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -63,7 +63,7 @@ weak_alias (__brk, brk)
int
_hurd_set_brk (vm_address_t addr)
{
error_t err;
error_t err = 0;
vm_address_t pagend = round_page (addr);
vm_address_t pagebrk = round_page (_hurd_brk);
long int rlimit;
@ -100,8 +100,22 @@ _hurd_set_brk (vm_address_t addr)
if (pagend > _hurd_data_end)
{
vm_address_t alloc_start = _hurd_data_end;
/* We didn't allocate enough space! Hopefully we can get some more! */
err = __vm_allocate (__mach_task_self (), &pagebrk, pagend - pagebrk, 0);
if (_hurd_data_end > pagebrk)
/* First finish allocation. */
err = __vm_protect (__mach_task_self (), pagebrk,
alloc_start - pagebrk, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
if (! err)
_hurd_brk = alloc_start;
if (! err)
err = __vm_allocate (__mach_task_self (), &alloc_start,
pagend - alloc_start, 0);
if (! err)
_hurd_data_end = pagend;
}