[aarch64_wheel] Fix readdir crash (#1574)

Probably fixes pytorch/pytorch#111695 (cherry picked from commit c5e331c)
pytorch · Oct 24, 2023 · 9eb5fcc · 9eb5fcc
1 parent 02ed62c
commit 9eb5fcc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/aarch64_linux/aarch64_wheel_ci_build.py b/aarch64_linux/aarch64_wheel_ci_build.py
@@ -108,6 +108,8 @@ def parse_arguments():
     # work around to fix Raspberry pie crash
     print("Applying mkl-dnn patch to fix Raspberry pie crash")
     os.system(f"cd /pytorch/third_party/ideep/mkl-dnn && patch -p1 < /builder/mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch")
+    print("Applying mkl-dnn patch to fix readdir crash")
+    os.system("cd /pytorch/third_party/ideep/mkl-dnn && patch -p1 < /builder/mkldnn_fix/aarch64-fix-readdir-crash.patch")
     os.system(f"cd /pytorch; {build_vars} python3 setup.py bdist_wheel")
     pytorch_wheel_name = complete_wheel("pytorch")
     print(f"Build Compelete. Created {pytorch_wheel_name}..")
diff --git a/mkldnn_fix/aarch64-fix-readdir-crash.patch b/mkldnn_fix/aarch64-fix-readdir-crash.patch
@@ -0,0 +1,14 @@
+diff --git a/src/cpu/aarch64/xbyak_aarch64/src/util_impl.cpp b/src/cpu/aarch64/xbyak_aarch64/src/util_impl.cpp
+index cb800b2509..5516373b90 100644
+--- a/src/cpu/aarch64/xbyak_aarch64/src/util_impl.cpp
++++ b/src/cpu/aarch64/xbyak_aarch64/src/util_impl.cpp
+@@ -170,6 +170,8 @@ int Cpu::getFilePathMaxTailNumPlus1(const char *path) {
+   fflush(stdout);
+
+   DIR *dir = opendir(dir_path);
++  if (dir == NULL)
++    return 0;
+   struct dirent *dp;
+
+   dp = readdir(dir);
+