diff options
author | Jeremy Allison <jra@samba.org> | 2013-08-27 12:49:00 -0700 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2015-03-15 22:14:07 +0100 |
commit | 681728af4fb9ac47eb9fee34b409b1cc8186153f (patch) | |
tree | 765b85a22cb179e77cc31c533a5a927578b74052 | |
parent | a49237cbb92e52929232046fb05d62e7f66e2ac8 (diff) | |
download | samba-681728af4fb9ac47eb9fee34b409b1cc8186153f.tar.gz |
Change __talloc() to only call talloc_memlimit_check()/talloc_memlimit_grow() on actual malloc allocation.
Don't check the memlimit if the allocation was successful from a pool. We already
checked the memory limit when we created the pool.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
(cherry picked from commit a4ebbe73b4b8dcab4d344e693ad9796ec8997f87)
-rw-r--r-- | lib/talloc/talloc.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 1e25dfde4e1..cee7d23ef7c 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -586,27 +586,24 @@ static inline void *__talloc(const void *context, size_t size) limit = ptc->limit; } - if (!talloc_memlimit_check(limit, (TC_HDR_SIZE+size))) { - errno = ENOMEM; - return NULL; - } - tc = talloc_alloc_pool(ptc, TC_HDR_SIZE+size); } if (tc == NULL) { + /* + * Only do the memlimit check/update on actual allocation. + */ + if (!talloc_memlimit_check(limit, TC_HDR_SIZE + size)) { + errno = ENOMEM; + return NULL; + } + tc = (struct talloc_chunk *)malloc(TC_HDR_SIZE+size); if (unlikely(tc == NULL)) return NULL; tc->flags = TALLOC_MAGIC; tc->pool = NULL; - } - if (limit != NULL) { - struct talloc_memlimit *l; - - for (l = limit; l != NULL; l = l->upper) { - l->cur_size += TC_HDR_SIZE+size; - } + talloc_memlimit_grow(limit, TC_HDR_SIZE + size); } tc->limit = limit; |