[kernel] r15532 - in dists/lenny-security/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Thu Apr 22 04:50:59 2010
New Revision: 15532

Log:
GFS2: Skip check for mandatory locks when unlocking (CVE-2010-0727)

Added:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/gfs2-skip-check-for-mandatory-locks-when-unlocking.patch
Modified:
   dists/lenny-security/linux-2.6/debian/changelog
   dists/lenny-security/linux-2.6/debian/patches/series/21lenny5

Modified: dists/lenny-security/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny-security/linux-2.6/debian/changelog	Thu Apr 22 04:38:58 2010	(r15531)
+++ dists/lenny-security/linux-2.6/debian/changelog	Thu Apr 22 04:50:59 2010	(r15532)
@@ -1,6 +1,7 @@
 linux-2.6 (2.6.26-21lenny5) UNRELEASED; urgency=high
 
   * USB: usbfs: only copy the actual data received (CVE-2010-1083)
+  * GFS2: Skip check for mandatory locks when unlocking (CVE-2010-0727)
 
  -- dann frazier <dannf at debian.org>  Wed, 21 Apr 2010 22:37:06 -0600
 

Added: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/gfs2-skip-check-for-mandatory-locks-when-unlocking.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/gfs2-skip-check-for-mandatory-locks-when-unlocking.patch	Thu Apr 22 04:50:59 2010	(r15532)
@@ -0,0 +1,28 @@
+commit 14bea9ede1e6c24491168cb2333d93485c788972
+Author: Sachin Prabhu <sprabhu at redhat.com>
+Date:   Thu Mar 11 12:24:45 2010 -0500
+
+    Backported to Debian's 2.6.26
+    
+    GFS2: Skip check for mandatory locks when unlocking
+    
+    gfs2_lock() will skip locks on file which have mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped and will result in a BUG in locks_remove_flock().
+    
+    gfs2_lock() should skip the check for mandatory locks when unlocking a file.
+    
+    Signed-off-by: Sachin Prabhu <sprabhu at redhat.com>
+    Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+
+diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
+index e1b7d52..34cc876 100644
+--- a/fs/gfs2/ops_file.c
++++ b/fs/gfs2/ops_file.c
+@@ -642,7 +642,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
+ 
+ 	if (!(fl->fl_flags & FL_POSIX))
+ 		return -ENOLCK;
+-	if (__mandatory_lock(&ip->i_inode))
++	if (__mandatory_lock(&ip->i_inode) && fl->fl_type != F_UNLCK)
+ 		return -ENOLCK;
+ 
+ 	if (cmd == F_CANCELLK) {

Modified: dists/lenny-security/linux-2.6/debian/patches/series/21lenny5
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/21lenny5	Thu Apr 22 04:38:58 2010	(r15531)
+++ dists/lenny-security/linux-2.6/debian/patches/series/21lenny5	Thu Apr 22 04:50:59 2010	(r15532)
@@ -1 +1,2 @@
 + bugfix/all/usbfs-only-copy-received-data.patch
++ bugfix/all/gfs2-skip-check-for-mandatory-locks-when-unlocking.patch