fix

diff --git a/ChangeLog b/ChangeLog
index 8a62542feb5d5392f32533cd93aceed9b0d96704..68825c9009202a1e7d6da17195ee31da40f3a693 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.  Found by
+       Stéphane Rosi
+
 2006-02-02  Miklos Szeredi <miklos@szeredi.hu>
 
        * Released 2.5.2

diff --git a/lib/fuse.c b/lib/fuse.c
index 7d66a7d689b6510f5e34432dc20fa84bf8165488..cad77e4b556885bd495d8864b810629db746b39f 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -547,8 +547,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 219ee1419ea7b1db849ff204a16d5f7f2d0f9a48..7a59b01d5e64984fced5b0a7840ea8846c9c93d2 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -291,4 +291,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");