[kernel] r15139 - in dists/lenny-security/linux-2.6/debian: . patches/features/all/xen patches/series

[Dann Frazier]

Author: dannf
Date: Wed Feb 10 07:44:49 2010
New Revision: 15139

Log:
port CVE-2010-0307 fix for xen

Added:
   dists/lenny-security/linux-2.6/debian/patches/features/all/xen/get-rid-of-TIF_ABI_PENDING-bit.patch
Modified:
   dists/lenny-security/linux-2.6/debian/changelog
   dists/lenny-security/linux-2.6/debian/patches/series/21lenny3-extra

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Wed Feb 10 06:23:35 2010	(r15138)
+++ dists/lenny-security/linux-2.6/debian/changelog	Wed Feb 10 07:44:49 2010	(r15139)
@@ -8,7 +8,7 @@
   * KVM: emulator privilege escalation (CVE-2010-0298)
   * KVM: emulator privilege escalation IOPL/CPL level check (CVE-2010-0306)
 
- -- dann frazier <dannf at debian.org>  Mon, 08 Feb 2010 16:42:16 -0700
+ -- dann frazier <dannf at debian.org>  Tue, 09 Feb 2010 22:28:22 -0700
 
 linux-2.6 (2.6.26-21lenny2) stable-security; urgency=high
 

Added: dists/lenny-security/linux-2.6/debian/patches/features/all/xen/get-rid-of-TIF_ABI_PENDING-bit.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/xen/get-rid-of-TIF_ABI_PENDING-bit.patch	Wed Feb 10 07:44:49 2010	(r15139)
@@ -0,0 +1,37 @@
+diff -urpN a/arch/x86/kernel/process_64-xen.c b/arch/x86/kernel/process_64-xen.c
+--- a/arch/x86/kernel/process_64-xen.c	2010-02-09 22:08:25.000000000 -0700
++++ b/arch/x86/kernel/process_64-xen.c	2010-02-09 22:24:52.000000000 -0700
+@@ -280,15 +280,6 @@ void flush_thread(void)
+ {
+ 	struct task_struct *tsk = current;
+ 
+-	if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
+-		clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
+-		if (test_tsk_thread_flag(tsk, TIF_IA32)) {
+-			clear_tsk_thread_flag(tsk, TIF_IA32);
+-		} else {
+-			set_tsk_thread_flag(tsk, TIF_IA32);
+-			current_thread_info()->status |= TS_COMPAT;
+-		}
+-	}
+ 	clear_tsk_thread_flag(tsk, TIF_DEBUG);
+ 
+ 	tsk->thread.debugreg0 = 0;
+@@ -782,6 +773,17 @@ asmlinkage long sys_vfork(struct pt_regs
+ 		    NULL, NULL);
+ }
+ 
++void set_personality_ia32(void)
++{
++	/* inherit personality from parent */
++
++	/* Make sure to be in 32bit mode */
++	set_thread_flag(TIF_IA32);
++
++	/* Prepare the first "return" to user space */
++	current_thread_info()->status |= TS_COMPAT;
++}
++
+ unsigned long get_wchan(struct task_struct *p)
+ {
+ 	unsigned long stack;

Modified: dists/lenny-security/linux-2.6/debian/patches/series/21lenny3-extra
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/21lenny3-extra	Wed Feb 10 06:23:35 2010	(r15138)
+++ dists/lenny-security/linux-2.6/debian/patches/series/21lenny3-extra	Wed Feb 10 07:44:49 2010	(r15139)
@@ -1 +1,2 @@
 + features/all/openvz/remove-TIF_ABI-bit.patch featureset=openvz
++ features/all/xen/get-rid-of-TIF_ABI_PENDING-bit.patch featureset=xen