libfuse: highlevel API: fix directory file handle passed to ioctl() method

Reported by Eric Biggers

diff --git a/ChangeLog b/ChangeLog
index e8c47dcbdd8783e4f2eda03cd2e6d7b2e7d69ac5..7c134fca536459baac0d2a0aa11a8c2d5b63aad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-21  Miklos Szeredi <miklos@szeredi.hu>
+
+       * libfuse: highlevel API: fix directory file handle passed to
+       ioctl() method.  Reported by Eric Biggers
+
 2014-07-15  Miklos Szeredi <miklos@szeredi.hu>
 
        * libfuse: document deadlock avoidance for

diff --git a/include/fuse.h b/include/fuse.h
index bf86bda972ddcc0165527312071d36fc173c2029..e16104c3f6152d7315ff334ef87a3cfaa5b4dcd7 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -483,6 +483,9 @@ struct fuse_operations {
         * _IOC_READ in area and if both are set in/out area.  In all
         * non-NULL cases, the area is of _IOC_SIZE(cmd) bytes.
         *
+        * If flags has FUSE_IOCTL_DIR then the fuse_file_info refers to a
+        * directory file handle.
+        *
         * Introduced in version 2.8
         */
        int (*ioctl) (const char *, int cmd, void *arg,

diff --git a/lib/fuse.c b/lib/fuse.c
index 77da44609b18ce4f36e05c359615365a7419e799..75d657c4aad9d7a815771af7fc5e3c75d3c19004 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4106,12 +4106,13 @@ static void fuse_lib_bmap(fuse_req_t req, fuse_ino_t ino, size_t blocksize,
 }
 
 static void fuse_lib_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
-                          struct fuse_file_info *fi, unsigned int flags,
+                          struct fuse_file_info *llfi, unsigned int flags,
                           const void *in_buf, size_t in_bufsz,
                           size_t out_bufsz)
 {
        struct fuse *f = req_fuse_prepare(req);
        struct fuse_intr_data d;
+       struct fuse_file_info fi;
        char *path, *out_buf = NULL;
        int err;
 
@@ -4119,6 +4120,11 @@ static void fuse_lib_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
        if (flags & FUSE_IOCTL_UNRESTRICTED)
                goto err;
 
+       if (flags & FUSE_IOCTL_DIR)
+               get_dirhandle(llfi, &fi);
+       else
+               fi = *llfi;
+
        if (out_bufsz) {
                err = -ENOMEM;
                out_buf = malloc(out_bufsz);
@@ -4136,7 +4142,7 @@ static void fuse_lib_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg,
 
        fuse_prepare_interrupt(f, req, &d);
 
-       err = fuse_fs_ioctl(f->fs, path, cmd, arg, fi, flags,
+       err = fuse_fs_ioctl(f->fs, path, cmd, arg, &fi, flags,
                            out_buf ?: (void *)in_buf);
 
        fuse_finish_interrupt(f, req, &d);