From: Michael Brown Date: Thu, 22 May 2025 13:12:12 +0000 (+0100) Subject: [initrd] Allow for images straddling the top of the reshuffle region X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11929389e4298bbe4b7dce09ef2f2c4368c009c1;p=thirdparty%2Fipxe.git [initrd] Allow for images straddling the top of the reshuffle region It is hypothetically possible for external heap memory allocated during driver startup to have been freed before an image was downloaded, which could therefore leave an image straddling the address recorded as the top of the reshuffle region. Allow for this possibility by skipping squashing for any images already straddling (or touching) the top of the reshuffle region. Signed-off-by: Michael Brown --- diff --git a/src/image/initrd.c b/src/image/initrd.c index 5e8735518..5ba8c473d 100644 --- a/src/image/initrd.c +++ b/src/image/initrd.c @@ -68,8 +68,15 @@ static void initrd_squash_high ( physaddr_t top ) { if ( ! highest ) break; - /* Move this image to its final position */ + /* Calculate final position */ current -= initrd_align ( highest->len ); + if ( current <= virt_to_phys ( highest->data ) ) { + /* Already at (or crossing) top of region */ + current = virt_to_phys ( highest->data ); + continue; + } + + /* Move this image to its final position */ DBGC ( &images, "INITRD squashing %s [%#08lx,%#08lx)->" "[%#08lx,%#08lx)\n", highest->name, virt_to_phys ( highest->data ),