9pfs: set S_IFREG for regular files (fix Invalid argument on linux 6.…

…6+, fix #996)
copy · Apr 23, 2024 · 2ca82a5 · 2ca82a5
1 parent 09678e0
commit 2ca82a5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/9p.js b/lib/9p.js
@@ -363,6 +363,7 @@ Virtio9p.prototype.ReceiveRequest = async function (bufchain) {
             var idx = this.fs.CreateNode(name, this.fids[fid].inodeid, major, minor);
             var inode = this.fs.GetInode(idx);
             inode.mode = mode;
+            //inode.mode = mode | S_IFCHR; // XXX: fails "Mknod - fifo" test
             inode.uid = this.fids[fid].uid;
             inode.gid = gid;
             marshall.Marshall(["Q"], [inode.qid], this.replybuffer, 7);
@@ -415,7 +416,7 @@ Virtio9p.prototype.ReceiveRequest = async function (bufchain) {
             var inode = this.fs.GetInode(idx);
             inode.uid = this.fids[fid].uid;
             inode.gid = gid;
-            inode.mode = mode;
+            inode.mode = mode | S_IFREG;
             marshall.Marshall(["Q", "w"], [inode.qid, this.msize - 24], this.replybuffer, 7);
             this.BuildReply(id, tag, 13+4);
             this.SendReply(bufchain);
@@ -529,6 +530,7 @@ Virtio9p.prototype.ReceiveRequest = async function (bufchain) {
             var inode = this.fs.GetInode(this.fids[fid].inodeid);
             message.Debug("[setattr]: fid=" + fid + " request mask=" + req[1] + " name=" + this.fids[fid].dbg_name);
             if (req[1] & P9_SETATTR_MODE) {
+                // XXX: check mode (S_IFREG or S_IFDIR or similar should be set)
                 inode.mode = req[2];
             }
             if (req[1] & P9_SETATTR_UID) {