diff options
| author | David Decotigny | 2020-01-15 08:42:05 +0100 |
|---|---|---|
| committer | Michael Brown | 2020-07-21 15:51:32 +0200 |
| commit | 6ec33b8d6cc607579fcc90f551146831890d2070 (patch) | |
| tree | 3bd2148fce894f95dc04dbed960cd8ceb317d8ff /src/arch | |
| parent | [pcbios] Fix "out of memory" detection when expanding bottom area (diff) | |
| download | ipxe-6ec33b8d6cc607579fcc90f551146831890d2070.tar.gz ipxe-6ec33b8d6cc607579fcc90f551146831890d2070.tar.xz ipxe-6ec33b8d6cc607579fcc90f551146831890d2070.zip | |
[pcbios] Take alignment into account when checking for available space
Signed-off-by: David Decotigny <ddecotig@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/interface/pcbios/memtop_umalloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/interface/pcbios/memtop_umalloc.c b/src/arch/x86/interface/pcbios/memtop_umalloc.c index d7b82189a..1d3f40a1c 100644 --- a/src/arch/x86/interface/pcbios/memtop_umalloc.c +++ b/src/arch/x86/interface/pcbios/memtop_umalloc.c @@ -190,14 +190,14 @@ static userptr_t memtop_urealloc ( userptr_t ptr, size_t new_size ) { /* Expand/shrink block if possible */ if ( ptr == bottom ) { /* Update block */ - if ( new_size > ( heap_size + extmem.size ) ) { - DBG ( "EXTMEM out of space\n" ); - return UNULL; - } new = userptr_add ( ptr, - ( new_size - extmem.size ) ); align = ( user_to_phys ( new, 0 ) & ( EM_ALIGN - 1 ) ); new_size += align; new = userptr_add ( new, -align ); + if ( new_size > ( heap_size + extmem.size ) ) { + DBG ( "EXTMEM out of space\n" ); + return UNULL; + } DBG ( "EXTMEM expanding [%lx,%lx) to [%lx,%lx)\n", user_to_phys ( ptr, 0 ), user_to_phys ( ptr, extmem.size ), |