[kernel] r6556 - in dists/sid/linux-2.6/debian: patches
patches/series
Bastian Blank
waldi at costa.debian.org
Thu May 11 10:29:02 UTC 2006
Author: waldi
Date: Thu May 11 10:28:58 2006
New Revision: 6556
Added:
dists/sid/linux-2.6/debian/patches/2.6.16.16 (contents, props changed)
dists/sid/linux-2.6/debian/patches/series/14
Modified:
dists/sid/linux-2.6/debian/changelog
Log:
Add stable release 2.6.16.16.
* debian/changelog: Update.
* debian/patches/series/14: Enable 2.6.16.16.
* debian/patches/2.6.16.16: Add.
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Thu May 11 10:28:58 2006
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.16-14) UNRELEASED; urgency=low
+
+ * Add stable release 2.6.16.16:
+ - fs/locks.c: Fix lease_init (CVE-2006-1860)
+
+ -- Bastian Blank <waldi at debian.org> Thu, 11 May 2006 12:27:20 +0200
+
linux-2.6 (2.6.16-13) unstable; urgency=low
[ Frederik Schüler ]
Added: dists/sid/linux-2.6/debian/patches/2.6.16.16
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/2.6.16.16 Thu May 11 10:28:58 2006
@@ -0,0 +1,62 @@
+diff --git a/fs/locks.c b/fs/locks.c
+index e75ac39..aa7f660 100644
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -432,15 +432,14 @@ static struct lock_manager_operations le
+ */
+ static int lease_init(struct file *filp, int type, struct file_lock *fl)
+ {
++ if (assign_type(fl, type) != 0)
++ return -EINVAL;
++
+ fl->fl_owner = current->files;
+ fl->fl_pid = current->tgid;
+
+ fl->fl_file = filp;
+ fl->fl_flags = FL_LEASE;
+- if (assign_type(fl, type) != 0) {
+- locks_free_lock(fl);
+- return -EINVAL;
+- }
+ fl->fl_start = 0;
+ fl->fl_end = OFFSET_MAX;
+ fl->fl_ops = NULL;
+@@ -452,16 +451,19 @@ static int lease_init(struct file *filp,
+ static int lease_alloc(struct file *filp, int type, struct file_lock **flp)
+ {
+ struct file_lock *fl = locks_alloc_lock();
+- int error;
++ int error = -ENOMEM;
+
+ if (fl == NULL)
+- return -ENOMEM;
++ goto out;
+
+ error = lease_init(filp, type, fl);
+- if (error)
+- return error;
++ if (error) {
++ locks_free_lock(fl);
++ fl = NULL;
++ }
++out:
+ *flp = fl;
+- return 0;
++ return error;
+ }
+
+ /* Check if two locks overlap each other.
+@@ -1337,6 +1339,7 @@ static int __setlease(struct file *filp,
+ goto out;
+
+ if (my_before != NULL) {
++ *flp = *my_before;
+ error = lease->fl_lmops->fl_change(my_before, arg);
+ goto out;
+ }
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at http://www.tux.org/lkml/
+
Added: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/14 Thu May 11 10:28:58 2006
@@ -0,0 +1 @@
++ 2.6.16.16
More information about the Kernel-svn-changes
mailing list