|
 |
15f68b |
--- ElectricFence-2.2.2/page.c.jj 1999-04-11 17:45:26.000000000 -0400
|
|
|
15f68b |
+++ ElectricFence-2.2.2/page.c 2004-10-16 12:30:10.000000000 -0400
|
|
|
15f68b |
@@ -160,8 +160,9 @@ Page_DenyAccess(void * address, size_t s
|
|
|
15f68b |
void
|
|
|
15f68b |
Page_Delete(void * address, size_t size)
|
|
|
15f68b |
{
|
|
|
15f68b |
- if ( munmap((caddr_t)address, size) < 0 )
|
|
|
15f68b |
- Page_DenyAccess(address, size);
|
|
|
15f68b |
+ Page_DenyAccess(address, size);
|
|
|
15f68b |
+ /* Tell the kernel we will never need it again. */
|
|
|
15f68b |
+ madvise(address, size, MADV_DONTNEED);
|
|
|
15f68b |
}
|
|
|
15f68b |
|
|
|
15f68b |
#if defined(_SC_PAGESIZE)
|
|
|
15f68b |
--- ElectricFence-2.2.2/efence.c.jj 1999-04-12 21:00:49.000000000 -0400
|
|
|
15f68b |
+++ ElectricFence-2.2.2/efence.c 2004-10-16 13:11:30.000000000 -0400
|
|
|
15f68b |
@@ -626,10 +626,7 @@ memalign(size_t alignment, size_t userSi
|
|
|
15f68b |
address += internalSize - bytesPerPage;
|
|
|
15f68b |
|
|
|
15f68b |
/* Set up the "dead" page. */
|
|
|
15f68b |
- if ( EF_PROTECT_FREE )
|
|
|
15f68b |
- Page_Delete(address, bytesPerPage);
|
|
|
15f68b |
- else
|
|
|
15f68b |
- Page_DenyAccess(address, bytesPerPage);
|
|
|
15f68b |
+ Page_Delete(address, bytesPerPage);
|
|
|
15f68b |
|
|
|
15f68b |
/* Figure out what address to give the user. */
|
|
|
15f68b |
address -= userSize;
|
|
|
15f68b |
@@ -643,11 +640,8 @@ memalign(size_t alignment, size_t userSi
|
|
|
15f68b |
address = (char *)fullSlot->internalAddress;
|
|
|
15f68b |
|
|
|
15f68b |
/* Set up the "dead" page. */
|
|
|
15f68b |
- if ( EF_PROTECT_FREE )
|
|
|
15f68b |
- Page_Delete(address, bytesPerPage);
|
|
|
15f68b |
- else
|
|
|
15f68b |
- Page_DenyAccess(address, bytesPerPage);
|
|
|
15f68b |
-
|
|
|
15f68b |
+ Page_Delete(address, bytesPerPage);
|
|
|
15f68b |
+
|
|
|
15f68b |
address += bytesPerPage;
|
|
|
15f68b |
|
|
|
15f68b |
/* Set up the "live" page. */
|
|
|
15f68b |
@@ -777,10 +771,7 @@ free(void * address)
|
|
|
15f68b |
* in the hope that the swap space attached to those pages will be
|
|
|
15f68b |
* released as well.
|
|
|
15f68b |
*/
|
|
|
15f68b |
- if ( EF_PROTECT_FREE )
|
|
|
15f68b |
- Page_Delete(slot->internalAddress, slot->internalSize);
|
|
|
15f68b |
- else
|
|
|
15f68b |
- Page_DenyAccess(slot->internalAddress, slot->internalSize);
|
|
|
15f68b |
+ Page_Delete(slot->internalAddress, slot->internalSize);
|
|
|
15f68b |
|
|
|
15f68b |
previousSlot = slotForInternalAddressPreviousTo(slot->internalAddress);
|
|
|
15f68b |
nextSlot = slotForInternalAddress(
|