fixup! [LibOS] Missing lock around dentry->inode derefences

Signed-off-by: g2flyer <michael.steiner@intel.com>
gramineproject · Aug 27, 2024 · 0118b3f · 0118b3f
1 parent 08e6fc3
commit 0118b3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/libos/include/libos_process.h b/libos/include/libos_process.h
@@ -62,7 +62,9 @@ struct libos_process {
     LISTP_TYPE(libos_child_process) zombies;
 
     struct libos_lock children_lock;
-    struct libos_lock fs_lock; /* Note: has lower priority than g_dcache_lock. */
+
+    /* If g_dcache_lock is also required, acquire g_dcache_lock first and then fs_lock */
+    struct libos_lock fs_lock;
 
     /* Complete command line for the process, as reported by /proc/[pid]/cmdline; currently filled
      * once during initialization and not able to be modified.

diff --git a/libos/src/sys/libos_getcwd.c b/libos/src/sys/libos_getcwd.c
@@ -82,7 +82,7 @@ long libos_syscall_fchdir(int fd) {
     if (!hdl)
         return -EBADF;
 
-    int ret = 0;
+    int ret;
     lock(&g_dcache_lock);
 
     struct libos_dentry* dent = hdl->dentry;
@@ -106,6 +106,7 @@ long libos_syscall_fchdir(int fd) {
     put_dentry(g_process.cwd);
     g_process.cwd = dent;
     unlock(&g_process.fs_lock);
+    ret = 0;
 out:
     put_handle(hdl);
     unlock(&g_dcache_lock);