Linux 2.6.16.9
We (the -stable team) are announcing the release of the 2.6.16.9 kernel.
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between 2.6.16.8 and 2.6.16.9, as it is small enough to do so.
The updated 2.6.16.y git tree can be found at:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 +- arch/i386/kernel/cpu/amd.c | 2 ++ arch/x86_64/kernel/process.c | 8 ++++++-- arch/x86_64/kernel/setup.c | 4 ++++ include/asm-i386/cpufeature.h | 1 + include/asm-i386/i387.h | 30 ++++++++++++++++++++++++++---- include/asm-x86_64/cpufeature.h | 1 + include/asm-x86_64/i387.h | 20 +++++++++++++++++++- 8 files changed, 60 insertions(+), 8 deletions(-)
Summary of changes from v2.6.16.8 to v2.6.16.9
==============================================
Andi Kleen:
i386/x86-64: Fix x87 information leak between processes (CVE-2006-1056)
Greg Kroah-Hartman:
Linux 2.6.16.9
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 16 -EXTRAVERSION = .8 +EXTRAVERSION = .9 NAME=Sliding Snow Leopard # *DOCUMENTATION*
arch/i386/kernel/cpu/amd.c +2 -0
@@ -207,6 +207,8 @@ #define CBAR_KEY (0X000000CB)set_bit (X86_FEATURE_K7 , c->x86_capability);break ; } +if (c->x86 >=6 ) +set_bit (X86_FEATURE_FXSAVE_LEAK , c->x86_capability);display_cacheinfo (c);
arch/x86_64/kernel/process.c +6 -2
@@ -527,8 +527,6 @@ __switch_to(struct task_struct *prev_p,int cpu =smp_processor_id ();struct tss_struct *tss = &per_cpu (init_tss, cpu); -unlazy_fpu (prev_p); -/* * Reload esp0, LDT and the page table pointer: */
@@ -591,6 +589,12 @@ __switch_to(struct task_struct *prev_p, prev->userrsp =read_pda (oldrsp);write_pda (oldrsp, next->userrsp);write_pda (pcurrent, next_p); + +/* This must be here to ensure both math_state_restore() and +kernel_fpu_begin() work consistently. +And the AMD workaround requires it to be after DS reload. */ +unlazy_fpu (prev_p); +write_pda (kernelstack,task_stack_page (next_p) +THREAD_SIZE -PDA_STACKOFFSET );
arch/x86_64/kernel/setup.c +4 -0
@@ -909,6 +909,10 @@ #endifif (c->x86 ==15 && ((level >=0x0f48 && level <0x0f50 ) || level >=0x0f58 ))set_bit (X86_FEATURE_REP_GOOD , &c->x86_capability); +/* Enable workaround for FXSAVE leak */ +if (c->x86 >=6 ) +set_bit (X86_FEATURE_FXSAVE_LEAK , &c->x86_capability); + r =get_model_name (c);if (!r) {switch (c->x86) {
include/asm-i386/cpufeature.h +1 -0
@@ -70,6 +70,7 @@ #define X86_FEATURE_K7 (3*32+ 5) /* Ath#define X86_FEATURE_P3 (3*32+ 6)/* P3 */ #define X86_FEATURE_P4 (3*32+ 7)/* P4 */ #define X86_FEATURE_CONSTANT_TSC (3*32+ 8)/* TSC ticks at a constant rate */ +#define X86_FEATURE_FXSAVE_LEAK (3*32+10)/* FXSAVE leaks FOP/FIP/FOP */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0)/* Streaming SIMD Extensions-3 */
include/asm-i386/i387.h +26 -4
@@ -13,6 +13,7 @@ #define __ASM_I386_I387_H#include <linux/sched.h> #include <linux/init.h> +#include <linux/kernel_stat.h> #include <asm/processor.h> #include <asm/sigcontext.h> #include <asm/user.h>
@@ -38,17 +39,38 @@ #define restore_fpu(tsk) \extern void kernel_fpu_begin (void );#define kernel_fpu_end () do { stts(); preempt_enable(); } while(0) +/* We need a safe address that is cheap to find and that is already +in L1 during context switch. The best choices are unfortunately +different for UP and SMP */ +#ifdef CONFIG_SMP +#define safe_address (__per_cpu_offset[0]) +#else +#define safe_address (kstat_cpu(0).cpustat.user) +#endif +/* * These must be called with preempt disabled */ static inline void __save_init_fpu (struct task_struct *tsk ) { +/* Use more nops than strictly needed in case the compiler +varies code */ alternative_input ( -"fnsave %1 ; fwait ;" GENERIC_NOP2 , -"fxsave %1 ; fnclex" , +"fnsave %[fx] ;fwait;" GENERIC_NOP8 GENERIC_NOP4 , +"fxsave %[fx]\n" +"bt $7,%[fsw] ; jc 1f ; fnclex\n1:" , X86_FEATURE_FXSR, - "m" (tsk->thread.i387.fxsave) - :"memory"); + [fx] "m" (tsk->thread.i387.fxsave), + [fsw] "m" (tsk->thread.i387.fxsave.swd) : "memory"); +/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception +is pending. Clear the x87 state here by setting it to fixed + values. __per_cpu_offset[0] is a random variable that should be in L1 */ + alternative_input( + GENERIC_NOP8 GENERIC_NOP2, +"emms\n\t" /* clear stack tags */ +"fildl %[addr]" ,/* set F?P to defined value */ + X86_FEATURE_FXSAVE_LEAK, + [addr] "m" (safe_address));task_thread_info (tsk)->status &= ~TS_USEDFPU ; }
include/asm-x86_64/cpufeature.h +1 -0
@@ -64,6 +64,7 @@ #define X86_FEATURE_CENTAUR_MCR (3*32+ 3#define X86_FEATURE_REP_GOOD (3*32+ 4)/* rep microcode works well on this CPU */ #define X86_FEATURE_CONSTANT_TSC (3*32+5)/* TSC runs at constant rate */ #define X86_FEATURE_SYNC_RDTSC (3*32+6)/* RDTSC syncs CPU core */ +#define X86_FEATURE_FXSAVE_LEAK (3*32+7)/* FIP/FOP/FDP leaks through FXSAVE */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0)/* Streaming SIMD Extensions-3 */
include/asm-x86_64/i387.h +19 -1
@@ -72,6 +72,23 @@ #define set_fpu_cwd(t,val) ((t)->thread.#define set_fpu_swd (t,val) ((t)->thread.i387.fxsave.swd = (val))#define set_fpu_fxsr_twd (t,val) ((t)->thread.i387.fxsave.twd = (val)) +#define X87_FSW_ES (1 << 7)/* Exception Summary */ + +/* AMD CPUs don't save/restore FDP/FIP/FOP unless an exception +is pending. Clear the x87 state here by setting it to fixed +values. The kernel data segment can be sometimes 0 and sometimes +new user value. Both should be ok. +Use the PDA as safe address because it should be already in L1. */ +static inline void clear_fpu_state (struct i387_fxsave_struct *fx) +{ +if (unlikely (fx->swd &X87_FSW_ES )) + asmvolatile ("fnclex" ); + alternative_input(ASM_NOP8 ASM_NOP2, +" emms\n" /* clear stack tags */ +" fildl %%gs:0" ,/* load to clear state */ + X86_FEATURE_FXSAVE_LEAK); +} +static inline int restore_fpu_checking (struct i387_fxsave_struct *fx) {int err;
@@ -119,6 +136,7 @@ #else#endif if (unlikely (err))__clear_user (fx,sizeof (struct i387_fxsave_struct )); +/* No need to clear here because the caller clears USED_MATH */ return err; }
@@ -149,7 +167,7 @@ #else "i" (offsetof(__typeof__(*tsk), thread.i387.fxsave)));#endif - __asm__ __volatile__("fnclex" ); +clear_fpu_state (&tsk->thread.i387.fxsave); }static inline void kernel_fpu_begin (void )
include/asm-i386/cpufeature.h #define X86_FEATURE_K7 (3*32+ 5) /* Ath · line 73
Quoted 9 lines · Greg KH
include/asm-i386/cpufeature.h +1
-0@@ -70,6 +70,7 @@ #define X86_FEATURE_K7 (3*32+ 5) /* Ath#define X86_FEATURE_P3 (3*32+ 6)/* P3 */ #define X86_FEATURE_P4 (3*32+ 7)/* P4 */ #define X86_FEATURE_CONSTANT_TSC (3*32+ 8)/* TSC ticks at a constant rate */ +#define X86_FEATURE_FXSAVE_LEAK (3*32+10)/* FXSAVE leaks FOP/FIP/FOP */
Most likely "FOP/FIP/FDP"...
--
vda