x86-64, espfix: Don't leak bits 31:16 of %esp returning to 16-bit stack
commit 3891a04aafd668686239349ea58f3314ea2af86b upstream.
The IRET instruction, when returning to a 16-bit segment, only
restores the bottom 16 bits of the user space stack pointer. This
causes some 16-bit software to break, but it also leaks kernel state
to user space. We have a software workaround for that ("espfix") for
the 32-bit kernel, but it relies on a nonzero stack segment base which
is not available in 64-bit mode.
b3b42ac2cbae x86-64, modify_ldt: Ban 16-bit segments on 64-bit kernels
we "solved" this by forbidding 16-bit segments on 64-bit kernels, with
the logic that 16-bit support is crippled on 64-bit kernels anyway (no
V86 support), but it turns out that people are doing stuff like
running old Win16 binaries under Wine and expect it to work.
This works around this by creating percpu "ministacks", each of which
is mapped 2^16 times 64K apart. When we detect that the return SS is
on the LDT, we copy the IRET frame to the ministack and use the
relevant alias to return to userspace. The ministacks are mapped
readonly, so if IRET faults we promote #GP to #DF which is an IST
vector and thus has its own stack; we then do the fixup in the #DF
(Making #GP an IST exception would make the msr_safe functions unsafe
in NMI/MC context, and quite possibly have other effects.)
Special thanks to:
- Andy Lutomirski, for the suggestion of using very small stack slots
and copy (as opposed to map) the IRET frame there, and for the
suggestion to mark them readonly and let the fault promote to #DF.
- Konrad Wilk for paravirt fixup and testing.
- Borislav Petkov for testing help and useful comments.
Reported-by: Brian Gerst <firstname.lastname@example.org>
Signed-off-by: H. Peter Anvin <email@example.com>
Cc: Konrad Rzeszutek Wilk <firstname.lastname@example.org>
Cc: Borislav Petkov <email@example.com>
Cc: Andrew Lutomriski <firstname.lastname@example.org>
Cc: Linus Torvalds <email@example.com>
Cc: Dirk Hohndel <firstname.lastname@example.org>
Cc: Arjan van de Ven <email@example.com>
Cc: comex <firstname.lastname@example.org>
Cc: Alexander van Heukelum <email@example.com>
Cc: Boris Ostrovsky <firstname.lastname@example.org>
Signed-off-by: Greg Kroah-Hartman <email@example.com>
9 files changed