x86: implement x86_32 stack protector

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / entry_32.S

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 82e6868bee47e8606fdbf98ea2fc0bc5f9efa61a..5f5bd22adcd471a13d2f83775317c1c77714368b 100644 (file)
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -186,7 +186,7 @@
        /*CFI_REL_OFFSET gs, PT_GS*/
 .endm
 .macro SET_KERNEL_GS reg
-       xorl \reg, \reg
+       movl $(__KERNEL_STACK_CANARY), \reg
        movl \reg, %gs
 .endm