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

[Ben Hutchings]

Author: benh
Date: Sat Feb 27 21:59:28 2010
New Revision: 15288

Log:
Move fix for #568561 to lenny-security

This was a regression in 5.0.4 and should be fixed as soon as possible.
Fix verified by Ian Campbell.

Added:
   dists/lenny-security/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch
      - copied unchanged from r15280, dists/lenny/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch
Modified:
   dists/lenny-security/linux-2.6/debian/changelog
   dists/lenny-security/linux-2.6/debian/patches/series/21lenny4-extra
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22-extra

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Sat Feb 27 20:49:18 2010	(r15287)
+++ dists/lenny-security/linux-2.6/debian/changelog	Sat Feb 27 21:59:28 2010	(r15288)
@@ -1,10 +1,15 @@
 linux-2.6 (2.6.26-21lenny4) UNRELEASED; urgency=low
 
+  [ dann frazier ]
   * futex: Handle user space corruption gracefully (CVE-2010-0622)
   * mmap: cleanup compiler warnings from CVE-2010-0291 fixes
   * x86: set_personality_ia32() misses force_personality32, an additional
     fix for CVE-2010-0307
   * Replace fix for CVE-2009-2691 w/ upstreamed version (Closes: #570554)
+  
+  [ Ben Hutchings ]
+  * [xen][i386] Fix kernel logging via userspace (Closes: #568561)
+    (regression due to fix for #510478)
 
  -- dann frazier <dannf at debian.org>  Thu, 11 Feb 2010 17:14:23 -0700
 

Copied: dists/lenny-security/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch (from r15280, dists/lenny/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch	Sat Feb 27 21:59:28 2010	(r15288, copy of r15280, dists/lenny/linux-2.6/debian/patches/features/all/xen/printk-robustify-printk-xen.patch)
@@ -0,0 +1,16 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] [xen][i386] Fix kernel logging via userspace
+
+Xen has its own private copy of update_process_times() for i386.
+As part of the fix for #510478 this needs to call printk_tick() too.
+
+--- a/arch/x86/kernel/time_32-xen.c
++++ b/arch/x86/kernel/time_32-xen.c
+@@ -585,6 +585,7 @@
+ 	run_local_timers();
+ 	if (rcu_pending(cpu))
+ 		rcu_check_callbacks(cpu, user_mode_vm(get_irq_regs()));
++	printk_tick();
+ 	scheduler_tick();
+ 	run_posix_cpu_timers(current);
+ 	profile_tick(CPU_PROFILING);

Modified: dists/lenny-security/linux-2.6/debian/patches/series/21lenny4-extra
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/21lenny4-extra	Sat Feb 27 20:49:18 2010	(r15287)
+++ dists/lenny-security/linux-2.6/debian/patches/series/21lenny4-extra	Sat Feb 27 21:59:28 2010	(r15288)
@@ -1 +1,2 @@
 + features/all/xen/set_personality_ia32-misses-force_personality32.patch featureset=xen
++ features/all/xen/printk-robustify-printk-xen.patch featureset=xen

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Feb 27 20:49:18 2010	(r15287)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Feb 27 21:59:28 2010	(r15288)
@@ -31,8 +31,6 @@
     controllers (Closes: #547183)
   * postinst: Fix pattern-matching for 'do_bootloader' configuration option
     (Closes: #568317)
-  * [xen][i386] Fix kernel logging via userspace (Closes: #568561)
-    (regression due to fix for #510478)
   * yealink: Reliably kill URBs, fixing potential deadlock (Closes: #570532)
 
   [ dann frazier ]

Modified: dists/lenny/linux-2.6/debian/patches/series/22-extra
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22-extra	Sat Feb 27 20:49:18 2010	(r15287)
+++ dists/lenny/linux-2.6/debian/patches/series/22-extra	Sat Feb 27 21:59:28 2010	(r15288)
@@ -1,5 +1,4 @@
 + features/all/openvz/0087-cpt-dump-inode-content-for-shm_file_operations.patch featureset=openvz
 + features/all/openvz/0088-cfq-unlink-queues-at-bc-destroy.patch featureset=openvz
 + features/all/openvz/0089-inotify-unblock-umounting.patch featureset=openvz
-+ features/all/xen/printk-robustify-printk-xen.patch featureset=xen
 + features/all/xen/xen-fix-msi-hypercall.patch featureset=xen