[Qemu-devel] [PATCH] Fix bug with virtio-9p fsync

[Sassan Panahinejad]

JV: I hope I have correctly understood your description of how lock/getlock 
should behave.

v9fs_fsync and possibly others break when asked to operate on a directory.
It does not check fid_type to see if it is operating on a directory and 
therefore accesses the wrong element of the fs union.
This error can result in guest applications failing (in my case it was dpkg).
This patch fixes the issue and implements correct behaviour for fsync, wstat, 
lock and getlock.

Signed-off-by: Sassan Panahinejad <address@hidden>
---
 hw/virtio-9p.c |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c
index 7e29535..2530f6d 100644
--- a/hw/virtio-9p.c
+++ b/hw/virtio-9p.c
@@ -1875,7 +1875,13 @@ static void v9fs_fsync(V9fsState *s, V9fsPDU *pdu)
         v9fs_post_do_fsync(s, pdu, err);
         return;
     }
-    err = v9fs_do_fsync(s, fidp->fs.fd, datasync);
+    if (fidp->fid_type == P9_FID_FILE) {
+        err = v9fs_do_fsync(s, fidp->fs.fd, datasync);
+    } else if (fidp->fid_type == P9_FID_DIR) {
+        err = v9fs_do_fsync(s, dirfd(fidp->fs.dir), datasync);
+    } else {
+        err = -EINVAL;
+    }
     v9fs_post_do_fsync(s, pdu, err);
 }
 
@@ -2999,7 +3005,13 @@ static void v9fs_wstat(V9fsState *s, V9fsPDU *pdu)
 
     /* do we need to sync the file? */
     if (donttouch_stat(&vs->v9stat)) {
-        err = v9fs_do_fsync(s, vs->fidp->fs.fd, 0);
+        if (vs->fidp->fid_type == P9_FID_FILE) {
+            err = v9fs_do_fsync(s, vs->fidp->fs.fd, 0);
+        } else if (vs->fidp->fid_type == P9_FID_DIR) {
+            err = v9fs_do_fsync(s, dirfd(vs->fidp->fs.dir), 0);
+        } else {
+            err = -EINVAL;
+        }
         v9fs_wstat_post_fsync(s, vs, err);
         return;
     }
@@ -3199,7 +3211,15 @@ static void v9fs_lock(V9fsState *s, V9fsPDU *pdu)
         goto out;
     }
 
-    err = v9fs_do_fstat(s, vs->fidp->fs.fd, &vs->stbuf);
+    if (vs->fidp->fid_type == P9_FID_FILE) {
+        err = v9fs_do_fstat(s, vs->fidp->fs.fd, &vs->stbuf);
+    } else if (vs->fidp->fid_type == P9_FID_DIR) {
+        err = -EISDIR;
+        goto out;
+    } else {
+        err = -EINVAL;
+        goto out;
+    }
     if (err < 0) {
         err = -errno;
         goto out;
@@ -3237,7 +3257,15 @@ static void v9fs_getlock(V9fsState *s, V9fsPDU *pdu)
         goto out;
     }
 
-    err = v9fs_do_fstat(s, vs->fidp->fs.fd, &vs->stbuf);
+    if (vs->fidp->fid_type == P9_FID_FILE) {
+        err = v9fs_do_fstat(s, vs->fidp->fs.fd, &vs->stbuf);
+    } else if (vs->fidp->fid_type == P9_FID_DIR) {
+        err = -EISDIR;
+        goto out;
+    } else {
+        err = -EINVAL;
+        goto out;
+    }
     if (err < 0) {
         err = -errno;
         goto out;
-- 
1.7.0.4