tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fix from Ralf Baechle:
"Just one fix. The stack protector was loading the value of the canary
instead of its address"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: stack protector: Fix per-task canary switch

Linus Torvalds 46f37519 cd4edf7a

+3 -3
+1 -1
arch/mips/kernel/octeon_switch.S
··· 73 73 3: 74 74 75 75 #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) 76 - PTR_L t8, __stack_chk_guard 76 + PTR_LA t8, __stack_chk_guard 77 77 LONG_L t9, TASK_STACK_CANARY(a1) 78 78 LONG_S t9, 0(t8) 79 79 #endif
+1 -1
arch/mips/kernel/r2300_switch.S
··· 67 67 1: 68 68 69 69 #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) 70 - PTR_L t8, __stack_chk_guard 70 + PTR_LA t8, __stack_chk_guard 71 71 LONG_L t9, TASK_STACK_CANARY(a1) 72 72 LONG_S t9, 0(t8) 73 73 #endif
+1 -1
arch/mips/kernel/r4k_switch.S
··· 69 69 1: 70 70 71 71 #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) 72 - PTR_L t8, __stack_chk_guard 72 + PTR_LA t8, __stack_chk_guard 73 73 LONG_L t9, TASK_STACK_CANARY(a1) 74 74 LONG_S t9, 0(t8) 75 75 #endif