X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f096bcccb8e4c9ba57d128c2f08c52f7dc94e07d..38089ca5c8f4c06092324099fc38494f8491b53c:/src/src/store.c diff --git a/src/src/store.c b/src/src/store.c index a8f5a07fc..e8819e3e3 100644 --- a/src/src/store.c +++ b/src/src/store.c @@ -3,7 +3,7 @@ *************************************************/ /* Copyright (c) University of Cambridge 1995 - 2018 */ -/* Copyright (c) The Exim maintainers 2019 */ +/* Copyright (c) The Exim maintainers 2019 - 2020 */ /* See the file NOTICE for conditions of use and distribution. */ /* Exim gets and frees all its store through these functions. In the original @@ -37,11 +37,18 @@ The following different types of store are recognized: This means it can be freed when search_tidyup() is called to close down all the lookup caching. +- There is another pool (POOL_MESSAGE) used for medium-lifetime objects; within + a single message transaction but needed for longer than the use of the main + pool permits. Currently this means only receive-time DKIM information. + +- There is a dedicated pool for configuration data read from the config file(s). + Once complete, it is made readonly. + . Orthogonal to the three pool types, there are two classes of memory: untainted and tainted. The latter is used for values derived from untrusted input, and the string-expansion mechanism refuses to operate on such values (obviously, it can expand an untainted value to return a tainted result). The classes - are implemented by duplicating the three pool types. Pool resets are requested + are implemented by duplicating the four pool types. Pool resets are requested against the nontainted sibling and apply to both siblings. Only memory blocks requested for tainted use are regarded as tainted; anything @@ -50,17 +57,16 @@ The following different types of store are recognized: would be avoided. Intermediate layers (eg. the string functions) can test for taint, and use this - for ensuringn that results have proper state. For example the + for ensurinng that results have proper state. For example the string_vformat_trc() routing supporting the string_sprintf() interface will recopy a string being built into a tainted allocation if it meets a %s for a - tainted argument. - - Internally we currently use malloc for nontainted pools, and mmap for tainted - pools. The disparity is for speed of testing the taintedness of pointers; - because Linux appears to use distinct non-overlapping address allocations for - mmap vs. everything else, which means only two pointer-compares suffice for the - test. Other OS' cannot use that optimisation, and a more lengthy test against - the limits of tainted-pool allcations has to be done. + tainted argument. Any intermediate-layer function that (can) return a new + allocation should behave this way; returning a tainted result if any tainted + content is used. Intermediate-layer functions (eg. Ustrncpy) that modify + existing allocations fail if tainted data is written into an untainted area. + Users of functions that modify existing allocations should check if a tainted + source and an untainted destination is used, and fail instead (sprintf() being + the classic case). */ @@ -102,10 +108,21 @@ length. */ (((sizeof(storeblock) + alignment - 1) / alignment) * alignment) /* Size of block to get from malloc to carve up into smaller ones. This -must be a multiple of the alignment. We assume that 8192 is going to be -suitably aligned. */ - -#define STORE_BLOCK_SIZE (8192 - ALIGNED_SIZEOF_STOREBLOCK) +must be a multiple of the alignment. We assume that 4096 is going to be +suitably aligned. Double the size per-pool for every malloc, to mitigate +certain denial-of-service attacks. Don't bother to decrease on block frees. +We waste average half the current alloc size per pool. This could be several +hundred kB now, vs. 4kB with a constant-size block size. But the search time +for is_tainted(), linear in the number of blocks for the pool, is O(n log n) +rather than O(n^2). +A test of 2000 RCPTs and just accept ACL had 370kB in 21 blocks before, +504kB in 6 blocks now, for the untainted-main (largest) pool. +Builds for restricted-memory system can disable the expansion by +defining RESTRICTED_MEMORY */ +/*XXX should we allow any for malloc's own overhead? But how much? */ + +/* #define RESTRICTED_MEMORY */ +#define STORE_BLOCK_SIZE(order) ((1U << (order)) - ALIGNED_SIZEOF_STOREBLOCK) /* Variables holding data for the local pools of store. The current pool number is held in store_pool, which is global so that it can be changed from outside. @@ -114,18 +131,11 @@ even if the length is zero (which is used for getting a point to reset to). */ int store_pool = POOL_MAIN; -#define NPOOLS 6 static storeblock *chainbase[NPOOLS]; static storeblock *current_block[NPOOLS]; static void *next_yield[NPOOLS]; -static int yield_length[NPOOLS] = { -1, -1, -1, -1, -1, -1 }; - -/* The limits of the tainted pools. Tracking these on new allocations enables -a fast is_tainted implementation. We assume the kernel only allocates mmaps using -one side or the other of data+heap, not both. */ - -void * tainted_base = (void *)-1; -void * tainted_top = (void *)0; +static int yield_length[NPOOLS]; +static unsigned store_block_order[NPOOLS]; /* pool_malloc holds the amount of memory used by the store pools; this goes up and down as store is reset or released. nonpool_malloc is the total got by @@ -147,6 +157,7 @@ static int nbytes[NPOOLS]; /* current bytes allocated */ static int maxbytes[NPOOLS]; /* max number reached */ static int nblocks[NPOOLS]; /* current number of blocks allocated */ static int maxblocks[NPOOLS]; +static unsigned maxorder[NPOOLS]; static int n_nonpool_blocks; /* current number of direct store_malloc() blocks */ static int max_nonpool_blocks; static int max_pool_malloc; /* max value for pool_malloc */ @@ -157,58 +168,78 @@ static int max_nonpool_malloc; /* max value for nonpool_malloc */ static const uschar * pooluse[NPOOLS] = { [POOL_MAIN] = US"main", [POOL_PERM] = US"perm", +[POOL_CONFIG] = US"config", [POOL_SEARCH] = US"search", +[POOL_MESSAGE] = US"message", [POOL_TAINT_MAIN] = US"main", [POOL_TAINT_PERM] = US"perm", +[POOL_TAINT_CONFIG] = US"config", [POOL_TAINT_SEARCH] = US"search", +[POOL_TAINT_MESSAGE] = US"message", }; static const uschar * poolclass[NPOOLS] = { [POOL_MAIN] = US"untainted", [POOL_PERM] = US"untainted", +[POOL_CONFIG] = US"untainted", [POOL_SEARCH] = US"untainted", +[POOL_MESSAGE] = US"untainted", [POOL_TAINT_MAIN] = US"tainted", [POOL_TAINT_PERM] = US"tainted", +[POOL_TAINT_CONFIG] = US"tainted", [POOL_TAINT_SEARCH] = US"tainted", +[POOL_TAINT_MESSAGE] = US"tainted", }; #endif -static void * store_mmap(int, const char *, int); static void * internal_store_malloc(int, const char *, int); -static void internal_untainted_free(void *, const char *, int linenumber); -static void internal_tainted_free(storeblock *, const char *, int linenumber); +static void internal_store_free(void *, const char *, int linenumber); /******************************************************************************/ +/* Initialisation, for things fragile with parameter channges when using +static initialisers. */ -#ifndef TAINT_CHECK_FAST -/* Slower version check, for use when platform intermixes malloc and mmap area -addresses. */ +void +store_init(void) +{ +for (int i = 0; i < NPOOLS; i++) + { + yield_length[i] = -1; + store_block_order[i] = 12; /* log2(allocation_size) ie. 4kB */ + } +} + +/******************************************************************************/ + +/* Test if a pointer refers to tainted memory. + +Slower version check, for use when platform intermixes malloc and mmap area +addresses. Test against the current-block of all tainted pools first, then all +blocks of all tainted pools. + +Return: TRUE iff tainted +*/ BOOL is_tainted_fn(const void * p) { storeblock * b; -int pool; -for (pool = 0; pool < nelem(chainbase); pool++) +for (int pool = POOL_TAINT_BASE; pool < nelem(chainbase); pool++) if ((b = current_block[pool])) { - char * bc = CS b + ALIGNED_SIZEOF_STOREBLOCK; - if (CS p >= bc && CS p <= bc + b->length) goto hit; + uschar * bc = US b + ALIGNED_SIZEOF_STOREBLOCK; + if (US p >= bc && US p < bc + b->length) return TRUE; } -for (pool = 0; pool < nelem(chainbase); pool++) +for (int pool = POOL_TAINT_BASE; pool < nelem(chainbase); pool++) for (b = chainbase[pool]; b; b = b->next) { - char * bc = CS b + ALIGNED_SIZEOF_STOREBLOCK; - if (CS p >= bc && CS p <= bc + b->length) goto hit; + uschar * bc = US b + ALIGNED_SIZEOF_STOREBLOCK; + if (US p >= bc && US p < bc + b->length) return TRUE; } return FALSE; - -hit: -return pool >= POOL_TAINT_BASE; } -#endif void @@ -219,6 +250,20 @@ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Taint mismatch, %s: %s %d\n", } + +/******************************************************************************/ +void +store_writeprotect(int pool) +{ +#if !defined(COMPILE_UTILITY) && !defined(MISSING_POSIX_MEMALIGN) +for (storeblock * b = chainbase[pool]; b; b = b->next) + if (mprotect(b, ALIGNED_SIZEOF_STOREBLOCK + b->length, PROT_READ) != 0) + DEBUG(D_any) debug_printf("config block mprotect: (%d) %s\n", errno, strerror(errno)); +#endif +} + +/******************************************************************************/ + /************************************************* * Get a block from the current pool * *************************************************/ @@ -242,6 +287,17 @@ store_get_3(int size, BOOL tainted, const char *func, int linenumber) { int pool = tainted ? store_pool + POOL_TAINT_BASE : store_pool; +/* Ensure we've been asked to allocate memory. +A negative size is a sign of a security problem. +A zero size might be also suspect, but our internal usage deliberately +does this to return a current watermark value for a later release of +allocated store. */ + +if (size < 0 || size >= INT_MAX/2) + log_write(0, LOG_MAIN|LOG_PANIC_DIE, + "bad memory allocation requested (%d bytes) at %s %d", + size, func, linenumber); + /* Round up the size to a multiple of the alignment. Although this looks a messy statement, because "alignment" is a constant expression, the compiler can do a reasonable job of optimizing, especially if the value of "alignment" is a @@ -256,7 +312,9 @@ these functions are mostly called for small amounts of store. */ if (size > yield_length[pool]) { - int length = size <= STORE_BLOCK_SIZE ? STORE_BLOCK_SIZE : size; + int length = MAX( + STORE_BLOCK_SIZE(store_block_order[pool]) - ALIGNED_SIZEOF_STOREBLOCK, + size); int mlength = length + ALIGNED_SIZEOF_STOREBLOCK; storeblock * newblock; @@ -269,10 +327,7 @@ if (size > yield_length[pool]) { /* Give up on this block, because it's too small */ nblocks[pool]--; - if (pool < POOL_TAINT_BASE) - internal_untainted_free(newblock, func, linenumber); - else - internal_tainted_free(newblock, func, linenumber); + internal_store_free(newblock, func, linenumber); newblock = NULL; } @@ -288,11 +343,21 @@ if (size > yield_length[pool]) if (++nblocks[pool] > maxblocks[pool]) maxblocks[pool] = nblocks[pool]; - newblock = tainted - ? store_mmap(mlength, func, linenumber) - : internal_store_malloc(mlength, func, linenumber); +#ifndef MISSING_POSIX_MEMALIGN + if (pool == POOL_CONFIG) + { + long pgsize = sysconf(_SC_PAGESIZE); + posix_memalign((void **)&newblock, pgsize, (mlength + pgsize - 1) & ~(pgsize - 1)); + } + else +#endif + newblock = internal_store_malloc(mlength, func, linenumber); newblock->next = NULL; newblock->length = length; +#ifndef RESTRICTED_MEMORY + if (store_block_order[pool]++ > maxorder[pool]) + maxorder[pool] = store_block_order[pool]; +#endif if (!chainbase[pool]) chainbase[pool] = newblock; @@ -315,10 +380,7 @@ store_last_get[pool] = next_yield[pool]; /* Cut out the debugging stuff for utilities, but stop picky compilers from giving warnings. */ -#ifdef COMPILE_UTILITY -func = func; -linenumber = linenumber; -#else +#ifndef COMPILE_UTILITY DEBUG(D_memory) debug_printf("---%d Get %6p %5d %-14s %4d\n", pool, store_last_get[pool], size, func, linenumber); @@ -393,6 +455,11 @@ int pool = tainted ? store_pool + POOL_TAINT_BASE : store_pool; int inc = newsize - oldsize; int rounded_oldsize = oldsize; +if (oldsize < 0 || newsize < oldsize || newsize >= INT_MAX/2) + log_write(0, LOG_MAIN|LOG_PANIC_DIE, + "bad memory extension requested (%d -> %d bytes) at %s %d", + oldsize, newsize, func, linenumber); + /* Check that the block being extended was already of the required taint status; refuse to extend if not. */ @@ -409,10 +476,7 @@ if (CS ptr + rounded_oldsize != CS (next_yield[pool]) || /* Cut out the debugging stuff for utilities, but stop picky compilers from giving warnings. */ -#ifdef COMPILE_UTILITY -func = func; -linenumber = linenumber; -#else +#ifndef COMPILE_UTILITY DEBUG(D_memory) debug_printf("---%d Ext %6p %5d %-14s %4d\n", pool, ptr, newsize, func, linenumber); @@ -428,6 +492,14 @@ return TRUE; +static BOOL +is_pwr2_size(int len) +{ +unsigned x = len; +return (x & (x - 1)) == 0; +} + + /************************************************* * Back up to a previous point on the stack * *************************************************/ @@ -438,7 +510,8 @@ not call with a pointer returned by store_get(). Both the untainted and tainted pools corresposding to store_pool are reset. Arguments: - r place to back up to + ptr place to back up to + pool pool holding the pointer func function from which called linenumber line number in source file @@ -499,11 +572,11 @@ current_block[pool] = b; /* Free any subsequent block. Do NOT free the first successor, if our current block has less than 256 bytes left. This should prevent us from flapping memory. However, keep this block only when it has -the default size. */ +a power-of-two size so probably is not a custom inflated one. */ if ( yield_length[pool] < STOREPOOL_MIN_SIZE && b->next - && b->next->length == STORE_BLOCK_SIZE) + && is_pwr2_size(b->next->length + ALIGNED_SIZEOF_STOREBLOCK)) { b = b->next; #ifndef COMPILE_UTILITY @@ -516,11 +589,13 @@ if ( yield_length[pool] < STOREPOOL_MIN_SIZE } bb = b->next; -b->next = NULL; +if (pool != POOL_CONFIG) + b->next = NULL; while ((b = bb)) { int siz = b->length + ALIGNED_SIZEOF_STOREBLOCK; + #ifndef COMPILE_UTILITY if (debug_store) assert_no_variables(b, b->length + ALIGNED_SIZEOF_STOREBLOCK, @@ -530,21 +605,20 @@ while ((b = bb)) nbytes[pool] -= siz; pool_malloc -= siz; nblocks[pool]--; - if (pool < POOL_TAINT_BASE) - internal_untainted_free(b, func, linenumber); - else - internal_tainted_free(b, func, linenumber); + if (pool != POOL_CONFIG) + internal_store_free(b, func, linenumber); + +#ifndef RESTRICTED_MEMORY + if (store_block_order[pool] > 13) store_block_order[pool]--; +#endif } /* Cut out the debugging stuff for utilities, but stop picky compilers from giving warnings. */ -#ifdef COMPILE_UTILITY -func = func; -linenumber = linenumber; -#else +#ifndef COMPILE_UTILITY DEBUG(D_memory) - debug_printf("---%d Rst %6p %5d %-14s %4d %d\n", pool, ptr, + debug_printf("---%d Rst %6p %5d %-14s %4d\tpool %d\n", pool, ptr, count + oldmalloc - pool_malloc, func, linenumber, pool_malloc); #endif /* COMPILE_UTILITY */ @@ -552,19 +626,19 @@ DEBUG(D_memory) rmark -store_reset_3(rmark r, int pool, const char *func, int linenumber) +store_reset_3(rmark r, const char *func, int linenumber) { void ** ptr = r; -if (pool >= POOL_TAINT_BASE) +if (store_pool >= POOL_TAINT_BASE) log_write(0, LOG_MAIN|LOG_PANIC_DIE, - "store_reset called for pool %d: %s %d\n", pool, func, linenumber); + "store_reset called for pool %d: %s %d\n", store_pool, func, linenumber); if (!r) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "store_reset called with bad mark: %s %d\n", func, linenumber); -internal_store_reset(*ptr, pool + POOL_TAINT_BASE, func, linenumber); -internal_store_reset(ptr, pool, func, linenumber); +internal_store_reset(*ptr, store_pool + POOL_TAINT_BASE, func, linenumber); +internal_store_reset(ptr, store_pool, func, linenumber); return NULL; } @@ -626,12 +700,9 @@ for (int pool = 0; pool < nelem(current_block); pool++) /* Cut out the debugging stuff for utilities, but stop picky compilers from giving warnings. */ -#ifdef COMPILE_UTILITY - func = func; - linenumber = linenumber; -#else +#ifndef COMPILE_UTILITY DEBUG(D_memory) - debug_printf("---%d Rel %6p %5d %-14s %4d %d\n", pool, ptr, count, + debug_printf("---%d Rel %6p %5d %-14s %4d\tpool %d\n", pool, ptr, count, func, linenumber, pool_malloc); #endif return; @@ -649,6 +720,12 @@ store_mark_3(const char *func, int linenumber) { void ** p; +#ifndef COMPILE_UTILITY +DEBUG(D_memory) + debug_printf("---%d Mrk %-14s %4d\tpool %d\n", + store_pool, func, linenumber, pool_malloc); +#endif /* COMPILE_UTILITY */ + if (store_pool >= POOL_TAINT_BASE) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "store_mark called for pool %d: %s %d\n", store_pool, func, linenumber); @@ -700,10 +777,7 @@ for (storeblock * b = chainbase[pool]; b; b = b->next) /* Cut out the debugging stuff for utilities, but stop picky compilers from giving warnings. */ -#ifdef COMPILE_UTILITY - func = func; - linenumber = linenumber; -#else +#ifndef COMPILE_UTILITY DEBUG(D_memory) debug_printf("-Release %6p %-20s %4d %d\n", (void *)bb, func, linenumber, pool_malloc); @@ -712,7 +786,7 @@ for (storeblock * b = chainbase[pool]; b; b = b->next) memset(bb, 0xF0, bb->length+ALIGNED_SIZEOF_STOREBLOCK); #endif /* COMPILE_UTILITY */ - free(bb); + internal_store_free(bb, func, linenumber); return; } } @@ -751,11 +825,16 @@ int pool = tainted ? store_pool + POOL_TAINT_BASE : store_pool; BOOL release_ok = !tainted && store_last_get[pool] == block; uschar * newtext; -#ifndef MACRO_PREDEF +#if !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY) if (is_tainted(block) != tainted) die_tainted(US"store_newblock", CUS func, linenumber); #endif +if (len < 0 || len > newsize) + log_write(0, LOG_MAIN|LOG_PANIC_DIE, + "bad memory extension requested (%d -> %d bytes) at %s %d", + len, newsize, func, linenumber); + newtext = store_get(newsize, tainted); memcpy(newtext, block, len); if (release_ok) store_release_3(block, pool, func, linenumber); @@ -765,55 +844,6 @@ return (void *)newtext; -/******************************************************************************/ -static void * -store_alloc_tail(void * yield, int size, const char * func, int line, - const uschar * type) -{ -if ((nonpool_malloc += size) > max_nonpool_malloc) - max_nonpool_malloc = nonpool_malloc; - -/* Cut out the debugging stuff for utilities, but stop picky compilers from -giving warnings. */ - -#ifdef COMPILE_UTILITY -func = func; line = line; type = type; -#else - -/* If running in test harness, spend time making sure all the new store -is not filled with zeros so as to catch problems. */ - -if (f.running_in_test_harness) - memset(yield, 0xF0, (size_t)size); -DEBUG(D_memory) debug_printf("--%6s %6p %5d bytes\t%-14s %4d\tpool %5d nonpool %5d\n", - type, yield, size, func, line, pool_malloc, nonpool_malloc); -#endif /* COMPILE_UTILITY */ - -return yield; -} - -/************************************************* -* Mmap store * -*************************************************/ - -static void * -store_mmap(int size, const char * func, int line) -{ -void * yield, * top; - -if (size < 16) size = 16; - -if (!(yield = mmap(NULL, (size_t)size, - PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0))) - log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to mmap %d bytes of memory: " - "called from line %d of %s", size, line, func); - -if (yield < tainted_base) tainted_base = yield; -if ((top = US yield + size) > tainted_top) tainted_top = top; - -return store_alloc_tail(yield, size, func, line, US"Mmap"); -} - /************************************************* * Malloc store * *************************************************/ @@ -825,23 +855,50 @@ function is called via the macro store_malloc(). Arguments: size amount of store wanted func function from which called - linenumber line number in source file + line line number in source file Returns: pointer to gotten store (panic on failure) */ static void * -internal_store_malloc(int size, const char *func, int linenumber) +internal_store_malloc(int size, const char *func, int line) { void * yield; +if (size < 0 || size >= INT_MAX/2) + log_write(0, LOG_MAIN|LOG_PANIC_DIE, + "bad memory allocation requested (%d bytes) at %s %d", + size, func, line); + +size += sizeof(int); /* space to store the size, used under debug */ if (size < 16) size = 16; if (!(yield = malloc((size_t)size))) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to malloc %d bytes of memory: " - "called from line %d in %s", size, linenumber, func); + "called from line %d in %s", size, line, func); + +#ifndef COMPILE_UTILITY +DEBUG(D_any) *(int *)yield = size; +#endif +yield = US yield + sizeof(int); -return store_alloc_tail(yield, size, func, linenumber, US"Malloc"); +if ((nonpool_malloc += size) > max_nonpool_malloc) + max_nonpool_malloc = nonpool_malloc; + +/* Cut out the debugging stuff for utilities, but stop picky compilers from +giving warnings. */ + +#ifndef COMPILE_UTILITY +/* If running in test harness, spend time making sure all the new store +is not filled with zeros so as to catch problems. */ + +if (f.running_in_test_harness) + memset(yield, 0xF0, (size_t)size - sizeof(int)); +DEBUG(D_memory) debug_printf("--Malloc %6p %5d bytes\t%-20s %4d\tpool %5d nonpool %5d\n", + yield, size, func, line, pool_malloc, nonpool_malloc); +#endif /* COMPILE_UTILITY */ + +return yield; } void * @@ -868,37 +925,21 @@ Returns: nothing */ static void -internal_untainted_free(void * block, const char * func, int linenumber) +internal_store_free(void * block, const char * func, int linenumber) { -#ifdef COMPILE_UTILITY -func = func; -linenumber = linenumber; -#else -DEBUG(D_memory) - debug_printf("----Free %6p %-20s %4d\n", block, func, linenumber); -#endif /* COMPILE_UTILITY */ -free(block); +uschar * p = US block - sizeof(int); +#ifndef COMPILE_UTILITY +DEBUG(D_any) nonpool_malloc -= *(int *)p; +DEBUG(D_memory) debug_printf("----Free %6p %5d bytes\t%-20s %4d\n", block, *(int *)p, func, linenumber); +#endif +free(p); } void store_free_3(void * block, const char * func, int linenumber) { n_nonpool_blocks--; -internal_untainted_free(block, func, linenumber); -} - -/******************************************************************************/ -static void -internal_tainted_free(storeblock * block, const char * func, int linenumber) -{ -#ifdef COMPILE_UTILITY -func = func; -linenumber = linenumber; -#else -DEBUG(D_memory) - debug_printf("---Unmap %6p %-20s %4d\n", block, func, linenumber); -#endif -munmap((void *)block, block->length + ALIGNED_SIZEOF_STOREBLOCK); +internal_store_free(block, func, linenumber); } /******************************************************************************/ @@ -913,10 +954,36 @@ DEBUG(D_memory) (max_nonpool_malloc+1023)/1024, max_nonpool_blocks); debug_printf("----Exit npools max: %3d kB\n", max_pool_malloc/1024); for (int i = 0; i < NPOOLS; i++) - debug_printf("----Exit pool %d max: %3d kB in %d blocks\t%s %s\n", - i, maxbytes[i]/1024, maxblocks[i], poolclass[i], pooluse[i]); + debug_printf("----Exit pool %d max: %3d kB in %d blocks at order %u\t%s %s\n", + i, (maxbytes[i]+1023)/1024, maxblocks[i], maxorder[i], + poolclass[i], pooluse[i]); } #endif } + +/******************************************************************************/ +/* Per-message pool management */ + +static rmark message_reset_point = NULL; + +void +message_start(void) +{ +int oldpool = store_pool; +store_pool = POOL_MESSAGE; +if (!message_reset_point) message_reset_point = store_mark(); +store_pool = oldpool; +} + +void message_tidyup(void) +{ +int oldpool; +if (!message_reset_point) return; +oldpool = store_pool; +store_pool = POOL_MESSAGE; +message_reset_point = store_reset(message_reset_point); +store_pool = oldpool; +} + /* End of store.c */