Skip to content

Commit

Permalink
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upst…
Browse files Browse the repository at this point in the history 
…ream-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
  • Loading branch information
@torvalds
torvalds committed Oct 11, 2013
2 parents cd4edf7 + 8b3c569 commit 46f3751
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/mips/kernel/octeon_switch.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/kernel/r2300_switch.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/kernel/r4k_switch.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 46f3751

Please sign in to comment.