merge 2_5_bugfix branch

diff --git a/ChangeLog b/ChangeLog
index d6a1d1b75ca4df12213243c959873a8aec39015c..a18c55a7d649fe0b998ce72951c88877a4aeea38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-19  Miklos Szeredi <miklos@szeredi.hu>
+
+       * libfuse: fix use-after-free bug in interruptred reply_entry().
+       Patch from John Muir
+
+       * libfuse: fix wrong symbol versioning for fuse_mount.  Debian bug
+       ID: 352631.  Found by Stéphane Rosi
+
 2006-02-17  Miklos Szeredi <miklos@szeredi.hu>
 
        * Lowlevel lib: Unify fuse_dirent_size() and fuse_add_dirent()

diff --git a/lib/fuse.c b/lib/fuse.c
index f93040474c8a690027b853aa4d1b6e39f6f5a657..0ce05a66f836e288bad67d129e900767048c2def 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -603,8 +603,9 @@ static void reply_entry(fuse_req_t req, const struct fuse_entry_param *e,
                         int err)
 {
     if (!err) {
+        struct fuse *f = req_fuse(req);
         if (fuse_reply_entry(req, e) == -ENOENT)
-            forget_node(req_fuse(req), e->ino, 1);
+            forget_node(f, e->ino, 1);
     } else
         reply_err(req, err);
 }

diff --git a/lib/mount.c b/lib/mount.c
index 2840a54c029b2578c3d21e4020998d93413167cb..0a14df3ca16259273ae9a0791aca1d767a214615 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -292,4 +292,4 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[])
     return fuse_mount_compat22(mountpoint, NULL);
 }
 
-__asm__(".symver fuse_mount_compat22,fuse_mount@");
+__asm__(".symver fuse_mount_compat22,fuse_mount@FUSE_2.2");