From c6b80d76a6e1f76cdb5f1deaf298514843d0116a Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Mon, 22 Jul 2013 13:41:00 +0100 Subject: derivative_info: be sure not to dereference pointers All the BIOS get_derivative_info() implementations are incorrect. They all dereference pointers to various deriviative-specific data objects instead of using the address of the objects. This broke chain loading on SYSLINUX because the ->partoffset field contained the dereferenced value of 'Hidden' rather than the address. Signed-off-by: Matt Fleming --- core/isolinux-c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/isolinux-c.c') diff --git a/core/isolinux-c.c b/core/isolinux-c.c index 8574eac7..b0173e08 100644 --- a/core/isolinux-c.c +++ b/core/isolinux-c.c @@ -2,8 +2,8 @@ #include #include -extern far_ptr_t OrigESDI; -extern const uint64_t *Hidden; +extern uint32_t OrigESDI; +extern const uint64_t Hidden; extern uint16_t BIOSType; extern uint16_t bios_cdrom; extern uint8_t DriveNumber; @@ -16,7 +16,7 @@ __export void get_derivative_info(union syslinux_derivative_info *di) di->iso.drive_number = DriveNumber; di->iso.cd_mode = ((BIOSType - bios_cdrom) >> 2); - di->iso.spec_packet = spec_packet; - di->iso.esdi_ptr = GET_PTR(OrigESDI); - di->iso.partoffset = Hidden; + di->iso.spec_packet = &spec_packet; + di->iso.esdi_ptr = &OrigESDI; + di->iso.partoffset = &Hidden; } -- cgit v1.2.1