summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ldlinux.asm3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9bcd81fa..5cce5ab1 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Changes in 1.63:
correctly.
* Clean up "make install" target, honour INSTALLROOT if it
exists.
+ * SYSLINUX: Fix stack-smash bug identified by Steffen
+ Winterfeldt.
Changes in 1.62:
* PXELINUX: Allow the DHCP server to override the
diff --git a/ldlinux.asm b/ldlinux.asm
index 50e5e29f..c4647141 100644
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -259,7 +259,6 @@ xbs_vgatmpbuf equ 2*trackbufsize
absolute 5000h ; Here we keep our BSS stuff
-StackBuf equ $ ; Start the stack here (grow down - 4K)
VKernelBuf: resb vk_size ; "Current" vkernel
alignb 4
AppendBuf resb max_cmd_len+1 ; append=
@@ -341,6 +340,8 @@ VGAFileMBuf resb 11 ; Mangled VGA image name
section .text
org 7C00h
+StackBuf equ $ ; Start the stack here (grow down - 4K)
+
;
; Primary entry point. Tempting as though it may be, we can't put the
; initial "cli" here; the jmp opcode in the first byte is part of the