[kernel] r13582 - in dists/lenny-security/linux-2.6/debian: . patches/bugfix/mips patches/series

[Dann Frazier]

Author: dannf
Date: Wed May  6 14:24:11 2009
New Revision: 13582

Log:
mips: implement is_compat_task macro, fixing FTBFS introduced
by CVE-2009-0835 fix.

Added:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/mips/implement-is_compat_task.patch
   dists/lenny-security/linux-2.6/debian/patches/series/15lenny2
Modified:
   dists/lenny-security/linux-2.6/debian/changelog

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Wed May  6 14:19:56 2009	(r13581)
+++ dists/lenny-security/linux-2.6/debian/changelog	Wed May  6 14:24:11 2009	(r13582)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.26-15lenny2) UNRELEASED; urgency=high
+
+  * mips: implement is_compat_task macro, fixing FTBFS introduced
+    by CVE-2009-0835 fix.
+
+ -- dann frazier <dannf at debian.org>  Wed, 06 May 2009 08:20:35 -0600
+
 linux-2.6 (2.6.26-15lenny1) stable-security; urgency=high
 
   * copy_process: fix CLONE_PARENT && parent_exec_id interaction

Added: dists/lenny-security/linux-2.6/debian/patches/bugfix/mips/implement-is_compat_task.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/mips/implement-is_compat_task.patch	Wed May  6 14:24:11 2009	(r13582)
@@ -0,0 +1,41 @@
+commit 4302e5d53b9166d45317e3ddf0a7a9dab3efd43b
+Author: Ralf Baechle <ralf at linux-mips.org>
+Date:   Thu Mar 5 11:45:48 2009 +0100
+
+    MIPS: compat: Implement is_compat_task.
+    
+    This is a build fix required after "x86-64: seccomp: fix 32/64 syscall
+    hole" (commit 5b1017404aea6d2e552e991b3fd814d839e9cd67).  MIPS doesn't
+    have the issue that was fixed for x86-64 by that patch.
+    
+    This also doesn't solve the N32 issue which is that N32 seccomp processes
+    will be treated as non-compat processes thus only have access to N64
+    syscalls.
+    
+    Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+Backported to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/include/asm-mips/compat.h linux-source-2.6.26/include/asm-mips/compat.h
+--- linux-source-2.6.26.orig/include/asm-mips/compat.h	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/include/asm-mips/compat.h	2009-05-06 08:16:58.000000000 -0600
+@@ -3,6 +3,8 @@
+ /*
+  * Architecture specific compatibility types
+  */
++#include <linux/seccomp.h>
++#include <linux/thread_info.h>
+ #include <linux/types.h>
+ #include <asm/page.h>
+ #include <asm/ptrace.h>
+@@ -218,4 +220,9 @@ struct compat_shmid64_ds {
+ 	compat_ulong_t	__unused2;
+ };
+ 
++static inline int is_compat_task(void)
++{
++	return test_thread_flag(TIF_32BIT);
++}
++
+ #endif /* _ASM_COMPAT_H */

Added: dists/lenny-security/linux-2.6/debian/patches/series/15lenny2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/series/15lenny2	Wed May  6 14:24:11 2009	(r13582)
@@ -0,0 +1 @@
++ bugfix/mips/implement-is_compat_task.patch