[kernel] r8298 - in dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: Sat Feb 10 21:58:10 2007
New Revision: 8298

Added:
   dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/smbfs-honor-mount-opts-2.dpatch
Modified:
   dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge7
Log:
* [ERRATA] smbfs-honor-mount-opts-2.dpatch
  Fix some regressions with respect to file types (e.g., symlinks)
  introduced by the fix for CVE-2006-5174 in 2.6.8-16sarge6
  

Modified: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
==============================================================================
--- dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	(original)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	Sat Feb 10 21:58:10 2007
@@ -1,5 +1,8 @@
 kernel-source-2.6.8 (2.6.8-16sarge7) UNRELEASED; urgency=high
 
+  * [ERRATA] smbfs-honor-mount-opts-2.dpatch
+    Fix some regressions with respect to file types (e.g., symlinks)
+    introduced by the fix for CVE-2006-5174 in 2.6.8-16sarge6
   * mincore_hang.dpatch
     [SECURITY] Fix a potential deadlock in mincore, thanks to Marcel
     Holtmann for the patch.
@@ -17,8 +20,9 @@
     of the patch that went into 2.6.17.y. It would be better to fix the
     receiving end, but no patch for the era kernel has been developed yet.
     See CVE-2006-4623
+    
 
- -- dann frazier <dannf at debian.org>  Wed, 20 Dec 2006 14:59:57 -0700
+ -- dann frazier <dannf at debian.org>  Sat, 10 Feb 2007 13:53:53 -0700
 
 kernel-source-2.6.8 (2.6.8-16sarge6) stable-security; urgency=high
 

Modified: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge7
==============================================================================
--- dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge7	(original)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge7	Sat Feb 10 21:58:10 2007
@@ -2,3 +2,4 @@
 + mincore_hang.dpatch
 + dev_queue_xmit-error-path.dpatch
 + dvb-core-handle-0-length-ule-sndu.dpatch
++ smbfs-honor-mount-opts-2.dpatch

Added: dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/smbfs-honor-mount-opts-2.dpatch
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/smbfs-honor-mount-opts-2.dpatch	Sat Feb 10 21:58:10 2007
@@ -0,0 +1,64 @@
+
+#### ChangeSet ####
+2004-11-19 15:02:14-08:00, haroldo.gamal at infolink.com.br 
+  [PATCH] smbfs: Bug #3758 - Broken symlinks on smbfs
+  
+  The patches attached here fixes the BUG #3758 - "Broken symlinks on smbfs
+  with 2.6.10-rc[12]".  There are two patches, one to be applied over version
+  2.6.9 and the other over 2.6.10-rc2.
+  
+  The old utilities (and the old driver) uses uid=0, gid=0, dmask=0 and
+  fmask=0 to flag the lack of this parameters on the mount command line.
+  When the user do not specify the uid, gid, fmask or dmask, the current
+  driver will assign gid=root, gid=root, dmask=755, fmask=755.  This behavior
+  is similar to the old 2.x samba versions.
+  
+  To make the driver see the permissions and ownership assigned on the
+  server, "smbmount" and "smbmnt" utilities must be patched.  The patches is
+  already available on the attached patches at Bug #3330 or Samba Bug #999.
+  
+  Signed-off-by: Andrew Morton <akpm at osdl.org>
+  Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+==== fs/smbfs/inode.c ====
+2004-11-18 23:03:16-08:00, haroldo.gamal at infolink.com.br +4 -4
+  smbfs: Bug #3758 - Broken symlinks on smbfs
+
+--- 1.52/fs/smbfs/inode.c	2004-10-19 02:40:29 -07:00
++++ 1.53/fs/smbfs/inode.c	2004-11-18 23:03:16 -08:00
+@@ -574,10 +574,10 @@ int smb_fill_super(struct super_block *s
+ 		mnt->flags = (oldmnt->file_mode >> 9) | SMB_MOUNT_UID |
+ 			SMB_MOUNT_GID | SMB_MOUNT_FMODE | SMB_MOUNT_DMODE;
+ 	} else {
+-		mnt->file_mode = mnt->dir_mode = S_IRWXU | S_IRGRP | S_IXGRP |
+-						S_IROTH | S_IXOTH | S_IFREG;
+-		mnt->dir_mode = mnt->dir_mode = S_IRWXU | S_IRGRP | S_IXGRP |
+-						S_IROTH | S_IXOTH | S_IFDIR;
++		mnt->file_mode = S_IRWXU | S_IRGRP | S_IXGRP |
++				S_IROTH | S_IXOTH | S_IFREG;
++		mnt->dir_mode = S_IRWXU | S_IRGRP | S_IXGRP |
++				S_IROTH | S_IXOTH | S_IFDIR;
+ 		if (parse_options(mnt, raw_data))
+ 			goto out_bad_option;
+ 	}
+
+==== fs/smbfs/proc.c ====
+2004-11-18 23:03:16-08:00, haroldo.gamal at infolink.com.br +3 -2
+  smbfs: Bug #3758 - Broken symlinks on smbfs
+
+--- 1.42/fs/smbfs/proc.c	2004-10-19 02:40:29 -07:00
++++ 1.43/fs/smbfs/proc.c	2004-11-18 23:03:16 -08:00
+@@ -2138,10 +2138,11 @@ void smb_decode_unix_basic(struct smb_fa
+ 
+ 	if ( (server->mnt->flags & SMB_MOUNT_DMODE) &&
+ 	     (S_ISDIR(fattr->f_mode)) )
+-		fattr->f_mode = (server->mnt->dir_mode & (S_IRWXU | S_IRWXG | S_IRWXO)) | S_IFDIR;
++		fattr->f_mode = (server->mnt->dir_mode & S_IRWXUGO) | S_IFDIR;
+ 	else if ( (server->mnt->flags & SMB_MOUNT_FMODE) &&
+ 	          !(S_ISDIR(fattr->f_mode)) )
+-		fattr->f_mode = (server->mnt->file_mode & (S_IRWXU | S_IRWXG | S_IRWXO)) | S_IFREG;
++		fattr->f_mode = (server->mnt->file_mode & S_IRWXUGO) |
++				(fattr->f_mode & S_IFMT);
+ 
+ }
+