[kernel] r18983 - in dists/squeeze/linux-2.6/debian: . patches/debian patches/features/all/vserver patches/series

[Dann Frazier]

Author: dannf
Date: Sat May  5 17:39:17 2012
New Revision: 18983

Log:
Avoid ABI change on some archs due to a new #include in the
fix for CVE-2012-2123.

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/security-Avoid-ABI-change-due-to-personality.h-include.patch
   dists/squeeze/linux-2.6/debian/patches/series/45
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri May  4 23:46:33 2012	(r18982)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat May  5 17:39:17 2012	(r18983)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-45) UNRELEASED; urgency=low
+
+  * Avoid ABI change on some archs due to a new #include in the
+    fix for CVE-2012-2123.
+
+ -- dann frazier <dannf at debian.org>  Sat, 05 May 2012 11:13:05 -0600
+
 linux-2.6 (2.6.32-44) stable; urgency=low
 
   [ Ben Hutchings ]

Added: dists/squeeze/linux-2.6/debian/patches/debian/security-Avoid-ABI-change-due-to-personality.h-include.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/security-Avoid-ABI-change-due-to-personality.h-include.patch	Sat May  5 17:39:17 2012	(r18983)
@@ -0,0 +1,13 @@
+diff -urpN a/security/commoncap.c b/security/commoncap.c
+--- a/security/commoncap.c	2012-05-05 11:06:19.843502544 -0600
++++ b/security/commoncap.c	2012-05-05 11:08:10.491502598 -0600
+@@ -27,7 +27,9 @@
+ #include <linux/sched.h>
+ #include <linux/prctl.h>
+ #include <linux/securebits.h>
++#ifndef __GENKSYMS__
+ #include <linux/personality.h>
++#endif
+ 
+ /*
+  * If a non-root user executes a setuid-root binary in

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch	Fri May  4 23:46:33 2012	(r18982)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch	Sat May  5 17:39:17 2012	(r18983)
@@ -28257,10 +28257,10 @@
  
 --- a/security/commoncap.c	2009-12-03 20:03:02.000000000 +0100
 +++ a/security/commoncap.c	2011-06-10 13:03:02.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <linux/prctl.h>
- #include <linux/securebits.h>
+@@ -30,6 +30,7 @@
+ #ifndef __GENKSYMS__
  #include <linux/personality.h>
+ #endif
 +#include <linux/vs_context.h>
  
  /*

Added: dists/squeeze/linux-2.6/debian/patches/series/45
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/series/45	Sat May  5 17:39:17 2012	(r18983)
@@ -0,0 +1 @@
++ debian/security-Avoid-ABI-change-due-to-personality.h-include.patch