[kernel] r9536 - in dists/etch/linux-2.6/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Mon Sep 17 22:53:50 2007
New Revision: 9536

Log:
* Fix a BUG in fuse_ctl_add_dentry by resetting the dentry counter in
  fuse_ctl_kill_sb(). (closes: #427518)

Added:
   dists/etch/linux-2.6/debian/patches/bugfix/fuse-BUG-in-control-fs-mount.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/14

Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Mon Sep 17 22:53:50 2007
@@ -22,8 +22,10 @@
     This has only been shown to happen with certain serial devices so can only
     be triggered by a user who already has additional priveleges (dialout
     group). (closes: #404815)
+  * Fix a BUG in fuse_ctl_add_dentry by resetting the dentry counter in
+    fuse_ctl_kill_sb(). (closes: #427518)
 
- -- dann frazier <dannf at debian.org>  Sun, 16 Sep 2007 11:20:40 -0600
+ -- dann frazier <dannf at debian.org>  Mon, 17 Sep 2007 16:49:32 -0600
 
 linux-2.6 (2.6.18.dfsg.1-13etch2) stable-security; urgency=high
 

Added: dists/etch/linux-2.6/debian/patches/bugfix/fuse-BUG-in-control-fs-mount.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/bugfix/fuse-BUG-in-control-fs-mount.patch	Mon Sep 17 22:53:50 2007
@@ -0,0 +1,38 @@
+From: Miklos Szeredi <miklos at szeredi.hu>
+Date: Mon, 29 Jan 2007 21:19:54 +0000 (-0800)
+Subject: [PATCH] fuse: fix bug in control filesystem mount
+X-Git-Tag: v2.6.20-rc7~37
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ff79544754631cf3d237ff47b7d0e7ab2d211fcf
+
+[PATCH] fuse: fix bug in control filesystem mount
+
+The BUG in fuse_ctl_add_dentry() could be triggered if the control
+filesystem was unmounted and mounted again while one or more fuse
+filesystems were present.
+
+The fix is to reset the dentry counter in fuse_ctl_kill_sb().
+
+Bug reported by Florent Mertens.
+
+Signed-off-by: Miklos Szeredi <miklos at szeredi.hu>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+
+diff --git a/fs/fuse/control.c b/fs/fuse/control.c
+index 8c58bd4..1794305 100644
+--- a/fs/fuse/control.c
++++ b/fs/fuse/control.c
+@@ -193,8 +193,12 @@ static int fuse_ctl_get_sb(struct file_system_type *fs_type, int flags,
+ 
+ static void fuse_ctl_kill_sb(struct super_block *sb)
+ {
++	struct fuse_conn *fc;
++
+ 	mutex_lock(&fuse_mutex);
+ 	fuse_control_sb = NULL;
++	list_for_each_entry(fc, &fuse_conn_list, entry)
++		fc->ctl_ndents = 0;
+ 	mutex_unlock(&fuse_mutex);
+ 
+ 	kill_litter_super(sb);

Modified: dists/etch/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/etch/linux-2.6/debian/patches/series/14	(original)
+++ dists/etch/linux-2.6/debian/patches/series/14	Mon Sep 17 22:53:50 2007
@@ -15,3 +15,4 @@
 + bugfix/reset-pdeathsig-on-suid-upstream.patch
 + bugfix/ipv6-disallow-RH0-by-default-2.patch
 + bugfix/clear-spurious-irq.patch
++ bugfix/fuse-BUG-in-control-fs-mount.patch