Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46f37519 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cd4edf7a 8b3c569a

arch/mips/kernel/octeon_switch.S

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
3:



#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)

	PTR_L	t8, __stack_chk_guard

	PTR_LA	t8, __stack_chk_guard

	LONG_L	t9, TASK_STACK_CANARY(a1)

	LONG_S	t9, 0(t8)

#endif

arch/mips/kernel/r2300_switch.S

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ LEAF(resume) 
1:



#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)

	PTR_L	t8, __stack_chk_guard

	PTR_LA	t8, __stack_chk_guard

	LONG_L	t9, TASK_STACK_CANARY(a1)

	LONG_S	t9, 0(t8)

#endif

arch/mips/kernel/r4k_switch.S

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
1:



#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)

	PTR_L	t8, __stack_chk_guard

	PTR_LA	t8, __stack_chk_guard

	LONG_L	t9, TASK_STACK_CANARY(a1)

	LONG_S	t9, 0(t8)

#endif