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

[Ben Hutchings]

Author: benh
Date: Tue Mar 22 06:12:50 2011
New Revision: 17101

Log:
[vserver] Complete fix for CVE-2010-4243 (Closes: #618485)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vserver-complete-fix-for-CVE-2010-4243.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/32-extra

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue Mar 22 04:07:46 2011	(r17100)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue Mar 22 06:12:50 2011	(r17101)
@@ -18,6 +18,7 @@
   * Revert "drm/i915: Add pipe A force quirk for some laptops"
     (Closes: #618665; reopens: #608148)
   * scsi: Re-enable SCSI_PROC_FS (/proc/scsi directory) (Closes: #618258)
+  * [vserver] Complete fix for CVE-2010-4243 (Closes: #618485)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 12 Mar 2011 20:20:58 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vserver-complete-fix-for-CVE-2010-4243.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vserver-complete-fix-for-CVE-2010-4243.patch	Tue Mar 22 06:12:50 2011	(r17101)
@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] vserver: Complete fix for CVE-2010-4243
+
+VServer requires all adjustments to mm_struct::total_vm to be
+accounted to the server as well.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -169,7 +169,7 @@
+ 		return;
+ 
+ 	down_write(&mm->mmap_sem);
+-	mm->total_vm += diff;
++	vx_vmpages_add(mm, diff);
+ 	up_write(&mm->mmap_sem);
+ }
+ 

Modified: dists/squeeze/linux-2.6/debian/patches/series/32-extra
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/32-extra	Tue Mar 22 04:07:46 2011	(r17100)
+++ dists/squeeze/linux-2.6/debian/patches/series/32-extra	Tue Mar 22 06:12:50 2011	(r17101)
@@ -8,6 +8,7 @@
 
 + debian/revert-sched-changes-in-2.6.32.29.patch featureset=vserver
 + features/all/vserver/vs2.3.0.36.29.6.patch featureset=vserver
++ features/all/vserver/vserver-complete-fix-for-CVE-2010-4243.patch featureset=vserver
 
 + features/all/xen/pvops.patch featureset=xen
 + features/all/xen/xen-netfront-make-smartpoll-optional-and-default-off.patch featureset=xen