diff --git a/src/lib/libfs.js b/src/lib/libfs.js
index 7f345cdd993f3..84ab0bf8baaaa 100644
--- a/src/lib/libfs.js
+++ b/src/lib/libfs.js
@@ -197,6 +197,9 @@ FS.staticInit();`;
             current_path = PATH.dirname(current_path);
             if (FS.isRoot(current)) {
               path = current_path + '/' + parts.slice(i + 1).join('/');
+              // We're making progress here, don't let many consecutive ..'s
+              // lead to ELOOP
+              nlinks--;
               continue linkloop;
             } else {
               current = current.parent;
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
index 7c6c9a1d67b7a..24aca551b4a92 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8167
+8171
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
index ada4fd15d078f..87c594baff5aa 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-19798
+19802
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
index 98d1ee050c7a4..9f96f52ae75be 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8155
+8160
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
index a6f9d33e11ec2..7ed75764695a3 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-19776
+19780
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
index 2f315dd3f6228..be6b7db3622b4 100644
--- a/test/other/codesize/test_codesize_cxx_except.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9154
+9159
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
index 0933e2ebeb63d..844e4d91ffef1 100644
--- a/test/other/codesize/test_codesize_cxx_except.jssize
+++ b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-23459
+23463
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
index f70da493eb9af..7516f462d51d8 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8115
+8119
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
index 62547302be1b9..23f14519610da 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-19687
+19691
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize
index f70da493eb9af..7516f462d51d8 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize
@@ -1 +1 @@
-8115
+8119
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize
index 62547302be1b9..23f14519610da 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize
@@ -1 +1 @@
-19687
+19691
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
index 0943f904c364b..f9590eeca8c22 100644
--- a/test/other/codesize/test_codesize_cxx_lto.gzsize
+++ b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8019
+8023
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
index ecbbcf8e8d405..39fe2bb8d2412 100644
--- a/test/other/codesize/test_codesize_cxx_lto.jssize
+++ b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-19502
+19506
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
index a0af512f6bec4..06dcbb22123df 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.gzsize
+++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9171
+9176
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
index ba08eeeac3781..19a79b009fc79 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.jssize
+++ b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-23509
+23513
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
index 7c6c9a1d67b7a..24aca551b4a92 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8167
+8171
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
index ada4fd15d078f..87c594baff5aa 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.jssize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-19798
+19802
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
index 60e7ecdcd0ab9..d11cf0e2103c9 100644
--- a/test/other/codesize/test_codesize_files_js_fs.gzsize
+++ b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7480
+7485
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
index d27086ebb1c76..c335a90029d77 100644
--- a/test/other/codesize/test_codesize_files_js_fs.jssize
+++ b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18401
+18405
diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index b1a76a5094248..b40059dff3b33 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-11562
+11568
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index fb51bc599279b..d8a6faac5143a 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-27310
+27314
diff --git a/test/test_other.py b/test/test_other.py
index ec4e110c71309..edead0fd3eb39 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -6070,6 +6070,21 @@ def test_symlink_silly(self):
     self.assertContained(r'ok', self.run_js('a.out.js', args=['123', 'abc']))
     self.assertContained(r'Failed to symlink paths: abc, ; errno=44', self.run_js('a.out.js', args=['abc', '']))
 
+  @with_all_fs
+  def test_stat_many_dotdot(self):
+    path = "/".join([".."] * 75)
+    create_file('main.c', '''
+      #include <stdio.h>
+      #include <errno.h>
+      #include <sys/stat.h>
+
+      int main() {
+        struct stat path_stat;
+        return stat("%s", &path_stat);
+      }
+    ''' % path)
+    self.do_runf('main.c')
+
   def test_rename_silly(self):
     create_file('src.c', r'''
 #include <stdio.h>