[syslinux:elflink] PXELINUX: do not load 32-bit environment twice
syslinux-bot for Paulo Alcantara
pcacjr at zytor.com
Thu Apr 12 07:45:05 PDT 2012
Commit-ID: 94cfaa45195ee5c12bf61fc34696ed7be29c1cbe
Gitweb: http://www.syslinux.org/commit/94cfaa45195ee5c12bf61fc34696ed7be29c1cbe
Author: Paulo Alcantara <pcacjr at zytor.com>
AuthorDate: Sun, 8 Apr 2012 16:33:16 -0300
Committer: Paulo Alcantara <pcacjr at zytor.com>
CommitDate: Wed, 11 Apr 2012 18:18:58 -0300
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 at zytor.com>
---
core/pxelinux.asm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 68cb864..31224fd 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
More information about the Syslinux-commits
mailing list