Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 16c95cb904964ff45ba2bf077df266c893e3fa57..5bd0a997d81e28f1ab0ce859dfb2415128602909 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -383,6 +383,10 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
                 * we won't enable interupts or schedule before we invoke
                 * general_protection, so nothing will clobber the stack
                 * frame we just set up.
+                *
+                * We will enter general_protection with kernel GSBASE,
+                * which is what the stub expects, given that the faulting
+                * RIP will be the IRET instruction.
                 */
                regs->ip = (unsigned long)general_protection;
                regs->sp = (unsigned long)&gpregs->orig_ax;