project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ixallocx_prof() to check for size greater than HUGE_MAXCLASS.

Browse Source
This commit is contained in:
Jason Evans 2015-09-15 00:49:09 -07:00
parent 0108b1fd04
commit 8c485b02a6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -26,8 +26,7 @@ brevity. Much more detail can be found in the git revision history:
with interposed resets (triggered via the "prof.reset" mallctl). This bug with interposed resets (triggered via the "prof.reset" mallctl). This bug
could cause data structure corruption that would most likely result in a could cause data structure corruption that would most likely result in a
segfault. segfault.
- Fix xallocx() bugs related to the 'extra' parameter when specified as - Fix xallocx() bugs related to size+extra exceeding HUGE_MAXCLASS.
non-zero.
- Fix irealloc_prof() to prof_alloc_rollback() on OOM. - Fix irealloc_prof() to prof_alloc_rollback() on OOM.
- Make one call to prof_active_get_unlocked() per allocation event, and use - Make one call to prof_active_get_unlocked() per allocation event, and use
the result throughout the relevant functions that handle an allocation the result throughout the relevant functions that handle an allocation

6
src/jemalloc.c
View File

@ -2286,8 +2286,12 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size,
prof_active = prof_active_get_unlocked(); prof_active = prof_active_get_unlocked();
old_tctx = prof_tctx_get(ptr); old_tctx = prof_tctx_get(ptr);
/* Clamp extra if necessary to avoid (size + extra) overflow. */ /* Clamp extra if necessary to avoid (size + extra) overflow. */
if (unlikely(size + extra > HUGE_MAXCLASS)) if (unlikely(size + extra > HUGE_MAXCLASS)) {
/* Check for size overflow. */
if (size > HUGE_MAXCLASS)
return (old_usize);
extra = HUGE_MAXCLASS - size; extra = HUGE_MAXCLASS - size;
}
/* /*
* usize isn't knowable before ixalloc() returns when extra is non-zero. * usize isn't knowable before ixalloc() returns when extra is non-zero.
* Therefore, compute its maximum possible value and use that in * Therefore, compute its maximum possible value and use that in