diff options
| author | Sverker Eriksson <[email protected]> | 2014-07-11 18:52:43 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-07-11 18:52:43 +0200 |
| commit | b34d863a66ad6e048854faa171a71e1c8e4997eb (patch) | |
| tree | 5325243cf02d21cb754aa15486a5a93077801916 /erts/emulator/beam/erl_alloc_util.c | |
| parent | 386e8c157fce5d0b9f61a1e8ea03e20b6e875619 (diff) | |
| parent | 1d583e08cd5235881ede6f92800c25ddee13056f (diff) | |
| download | otp-b34d863a66ad6e048854faa171a71e1c8e4997eb.tar.gz otp-b34d863a66ad6e048854faa171a71e1c8e4997eb.tar.bz2 otp-b34d863a66ad6e048854faa171a71e1c8e4997eb.zip | |
Merge branch 'sverk/alloc-size-overflow' into maint
* sverk/alloc-size-overflow:
erts: Fix size overflow bugs in memory allocation
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 45f0cc4312..a4e164bf51 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -3274,6 +3274,15 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags) ASSERT(!(flags & CFLG_FORCE_MSEG && flags & CFLG_FORCE_SYS_ALLOC)); + if (umem_sz > (ERTS_UINT_MAX - ERTS_UINT_MAX/100)) { + /* Do an overly conservative _overflow_ check here so we don't + * have to deal with it from here on. I guess we could be more accurate + * but I don't think the need to allocate over 99% of the address space + * will ever arise on any machine, neither 32 nor 64 bit. + */ + return NULL; + } + blk_sz = UMEMSZ2BLKSZ(allctr, umem_sz); #ifdef ERTS_SMP |