projects
/
platform
/
upstream
/
syslinux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
230799d
)
PXELINUX: do not load 32-bit environment twice
author
Paulo Alcantara
<pcacjr@zytor.com>
Sun, 8 Apr 2012 19:33:16 +0000
(16:33 -0300)
committer
Paulo Alcantara
<pcacjr@zytor.com>
Wed, 11 Apr 2012 21:18:58 +0000
(18:18 -0300)
Calling load_env32() once, it should never return. If it does, then jump
to kaboom.
Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
core/pxelinux.asm
patch
|
blob
|
history
diff --git
a/core/pxelinux.asm
b/core/pxelinux.asm
index
68cb864
..
31224fd
100644
(file)
--- 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