aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Alcantara <pcacjr@zytor.com>2012-04-08 16:33:16 -0300
committerPaulo Alcantara <pcacjr@zytor.com>2012-04-11 18:18:58 -0300
commit94cfaa45195ee5c12bf61fc34696ed7be29c1cbe (patch)
treea0ee2d89788c76255adabaab87339d29a82c4f36
parent230799d53175d810dbbe47d209688a53a3ae02f1 (diff)
downloadsyslinux-94cfaa45195ee5c12bf61fc34696ed7be29c1cbe.tar.gz
syslinux-94cfaa45195ee5c12bf61fc34696ed7be29c1cbe.tar.xz
syslinux-94cfaa45195ee5c12bf61fc34696ed7be29c1cbe.zip
PXELINUX: do not load 32-bit environment twice
Calling load_env32() once, it should never return. If it does, then jump to kaboom. Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
-rw-r--r--core/pxelinux.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 68cb864d..31224fd5 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -223,7 +223,6 @@ adhcp_copy:
mov eax,ROOT_FS_OPS
xor ebp,ebp
pm_call fs_init
- pm_call load_env32
section .rodata
alignz 4
@@ -268,6 +267,7 @@ ROOT_FS_OPS:
; Jump to 32-bit ELF space
;
pm_call load_env32
+ jmp kaboom ; load_env32() shouldn't return. If it does, then kaboom!
;
; Now we have the config file open. Parse the config file and