Merge pull request #542 from bytedance/fix-mount-nodeblock

fix mount repeat failed and nodejs cannot block
bytedance · Oct 19, 2023 · a540bb8 · a540bb8
2 parents c0504eb + 1abf17d
commit a540bb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rasp/NSMount/main.cpp b/rasp/NSMount/main.cpp
@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) {
 
     if (std::filesystem::exists(dst, ec)) {
         LOG_WARNING("directory %s already exists", dst.u8string().c_str());
-        return -1;
+        return 0;
     }
 
     LOG_INFO("bind %s -> %s", src.u8string().c_str(), dst.u8string().c_str());

diff --git a/rasp/node/src/schema.js b/rasp/node/src/schema.js
@@ -78,7 +78,7 @@ const blockSchema = {
                         }
                     }
                 },
-                required: ['policy_id', 'class_id', 'method_id', 'rules', 'stack_frame']
+                required: ['class_id', 'method_id', 'rules']
             }
         }
     },

diff --git a/rasp/node/src/smith.js b/rasp/node/src/smith.js
@@ -142,7 +142,7 @@ function smithHook(func, classID, methodID, canBlock = false, processors = {}) {
                 if (policy.rules.length > 0 && !policy.rules.some(pred))
                     return false;
 
-                if (policy.stack_frame === null) {
+                if (!policy.stack_frame) {
                     smithTrace.blocked = true;
                     smithTrace.policy_id = policy.policy_id;
                     return true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ const blockSchema = { @@
                             }
                         }
                     },
-                    required: ['policy_id', 'class_id', 'method_id', 'rules', 'stack_frame']
+                    required: ['class_id', 'method_id', 'rules']
                 }
             }
         },
@@ Expand Down @@