Skip to content

Commit cc9f31e

Browse files
committed
[librm] Do not unconditionally preserve flags across virt_call()
Commit 196f0f2 ("[librm] Convert prot_call() to a real-mode near call") introduced a regression in which any deliberate modification to the low 16 bits of the CPU flags (in struct i386_all_regs) would be overwritten with the original flags value at the time of entry to prot_call(). The regression arose because the alignment requirements of the protected-mode stack necessitated the insertion of two bytes of padding immediately below the prot_call() return address. The solution chosen was to extend the existing "pushfl / popfl" pair to "pushfw;pushfl / popfl;popfw". The extra "pushfw / popfw" appears at first glance to be a no-op, but fails to take into account the fact that the flags restored by popfl may have been deliberately modified by the protected-mode function. Fix by replacing "pushfw / popfw" with "pushw %ss / popw %ss". While %ss does appear within struct i386_all_regs, any modification to the stored value has always been ignored by prot_call() anyway. The most visible symptom of this regression was that SAN booting would fail since every INT 13 call would be chained to the original INT 13 vector. Reported-by: Vishvananda Ishaya <vishvananda@gmail.com> Reported-by: Jamie Thompson <forum.ipxe@jamie-thompson.co.uk> Signed-off-by: Michael Brown <mcb30@ipxe.org>
1 parent 64acfd9 commit cc9f31e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/arch/x86/transitions/librm.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ VC_OFFSET_END:
940940
.globl virt_call
941941
virt_call:
942942
/* Preserve registers, flags and GDT on external RM stack */
943-
pushfw /* padding */
943+
pushw %ss /* padding */
944944
pushfl
945945
pushal
946946
pushw %gs
@@ -1030,7 +1030,7 @@ vc_rmode:
10301030
*/
10311031
addr32 movl -20(%esp), %esp
10321032
popfl
1033-
popfw /* padding */
1033+
popw %ss /* padding */
10341034

10351035
/* Return and discard function parameters */
10361036
ret $( VC_OFFSET_END - VC_OFFSET_PARAMS )

0 commit comments

Comments
 (0)