← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to arch/x86/include/asm/stackprotector.h

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/include/asm/stackprotector.h
78
78
#ifdef CONFIG_X86_64
79
79
        percpu_write(irq_stack_union.stack_canary, canary);
80
80
#else
81
 
        percpu_write(stack_canary.canary, canary);
 
81
        percpu_write(stack_canary, canary);
82
82
#endif
83
83
}
84
84
 
85
85
static inline void setup_stack_canary_segment(int cpu)
86
86
{
87
87
#ifdef CONFIG_X86_32
88
 
        unsigned long canary = (unsigned long)&per_cpu(stack_canary, cpu);
 
88
        unsigned long canary = (unsigned long)&per_cpu(stack_canary, cpu) - 20;
89
89
        struct desc_struct *gdt_table = get_cpu_gdt_table(cpu);
90
90
        struct desc_struct desc;
91
91