[kernel] r5042 - in dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: Mon Dec 19 10:08:27 2005
New Revision: 5042

Added:
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/198_fs-lock-lease-log-spam.diff
      - copied, changed from r5040, dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-lock-lease-log-spam.dpatch
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13
Modified:
   dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
Log:
[SECURITY] VFS: local denial-of-service with file leases. See CVE-2005-3857

Modified: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
==============================================================================
--- dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	(original)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	Mon Dec 19 10:08:27 2005
@@ -1,3 +1,10 @@
+kernel-source-2.4.27 (2.4.27-13) UNRELEASED; urgency=low
+
+  * 198_fs-lock-lease-log-spam.patch
+     [SECURITY] VFS: local denial-of-service with file leases. See CVE-2005-3857
+
+ -- Simon Horman <horms at verge.net.au>  Mon, 19 Dec 2005 19:06:39 +0900
+
 kernel-source-2.4.27 (2.4.27-12) unstable; urgency=low
 
   [ Simon Horman ]

Copied: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/198_fs-lock-lease-log-spam.diff (from r5040, dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-lock-lease-log-spam.dpatch)
==============================================================================
--- dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/fs-lock-lease-log-spam.dpatch	(original)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/198_fs-lock-lease-log-spam.diff	Mon Dec 19 10:08:27 2005
@@ -1,21 +1,21 @@
-commit f3a9388e4ebea57583272007311fffa26ebbb305
-tree c37a25e923505c9a62855b1e0ef822f7231e1a5a
-parent dc15ae14e97ee9d5ed740cbb0b94996076d8b37e
-author Chris Wright <chrisw at osdl.org> Fri, 11 Nov 2005 17:20:14 -0800
-committer Trond Myklebust <Trond.Myklebust at netapp.com> Sun, 13 Nov 2005 12:29:58 -0500
-
     [PATCH] VFS: local denial-of-service with file leases
     
     Remove time_out_leases() printk that's easily triggered by users.
     
     Signed-off-by: Chris Wright <chrisw at osdl.org>
     Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
-
+    
+    Above is the signoff information for
+    f3a9388e4ebea57583272007311fffa26ebbb305 included in Linus's 2.6 tree.
+    As this is CVE-2005-3857 I am proposing its inclusion in 2.4
+    
+    Signed-off-by: Horms <horms at verge.net.au>
+    
 diff --git a/fs/locks.c b/fs/locks.c
-index 600d1fb..250ef53 100644
+index 370ed4c..2f21d25 100644
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -1105,7 +1105,6 @@ static void time_out_leases(struct inode
+@@ -1087,7 +1087,6 @@ static void time_out_leases(struct inode
  			before = &fl->fl_next;
  			continue;
  		}

Added: dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13
==============================================================================
--- (empty file)
+++ dists/trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-13	Mon Dec 19 10:08:27 2005
@@ -0,0 +1 @@
++ 198_fs-lock-lease-log-spam.diff