fixes from kimi3
ober
4d9b686017332df237aff805b72f2499c8e659fd
--- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ endif NATIVE_DIR := $(JH)/jerboa-native-rs/target/release NATIVE_A := $(NATIVE_DIR)/libjerboa_native.a LIBDIRS := --libdirs lib:$(JH)/lib -JEXEC := $(JERBUILD) exec $(LIBDIRS) +JEXEC := $(JERBUILD) exec --unsafe-prelude $(LIBDIRS) BIN := jdns CARGO_AUDIT ?= $(shell command -v cargo-audit 2>/dev/null || printf '%s/.cargo/bin/cargo-audit' "$$HOME") DIST_DIR ?= dist/release-evidence --- a/lib/jerboa-dns/server.ss +++ b/lib/jerboa-dns/server.ss @@ -40,7 +40,7 @@ iota 1+ 1- partition make-date make-time) - (except (jerboa prelude) meta atom? sleep-ms) + (except (jerboa prelude) meta atom?) (jerboa-dns protocol) (jerboa-dns cdb) (jerboa-dns response) @@ -219,9 +219,6 @@ (set! *fiber-support-state* 'available) #t)])) - (def (sleep-ms ms) - (sleep (make-time 'time-duration (* (mod ms 1000) 1000000) (quotient ms 1000)))) - (def (tcp-sleep-ms ms) (if *fiber-sleep* (*fiber-sleep* ms) @@ -978,11 +975,11 @@ (send-udp-response! udp-sock out-rs client-addr)) MAX-PACKET)))) - (loop)) + (loop))) (lambda () (foreign-free recv-buf) (foreign-free client-addr) - (foreign-free addrlen-buf))))))))) + (foreign-free addrlen-buf)))))))) ) ;; ========== Landlock Sandbox (Linux) ========== --- a/tests/native-loader-security-test.sh +++ b/tests/native-loader-security-test.sh @@ -74,13 +74,13 @@ case $(uname -s) in (cd "$tmp/hostile" && DYLD_FALLBACK_LIBRARY_PATH="$tmp/hostile${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}" \ JERBOA_LOADER_SENTINEL_MARKER="$control_marker" \ - "$jerbuild" exec --libdirs "$jh/lib" "$tmp/bare-control.ss") + "$jerbuild" exec --unsafe-prelude --libdirs "$jh/lib" "$tmp/bare-control.ss") ;; *) (cd "$tmp/hostile" && LD_LIBRARY_PATH="$tmp/hostile${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \ JERBOA_LOADER_SENTINEL_MARKER="$control_marker" \ - "$jerbuild" exec --libdirs "$jh/lib" "$tmp/bare-control.ss") + "$jerbuild" exec --unsafe-prelude --libdirs "$jh/lib" "$tmp/bare-control.ss") ;; esac [ -e "$control_marker" ] || { @@ -103,13 +103,13 @@ case $(uname -s) in (cd "$tmp/hostile" && DYLD_FALLBACK_LIBRARY_PATH="$tmp/hostile:$native_dir${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}" \ JERBOA_LOADER_SENTINEL_MARKER="$marker" \ - "$jerbuild" exec --libdirs "$root/lib:$core_lib:$jh/lib" "$tmp/probe.ss") || rc=$? + "$jerbuild" exec --unsafe-prelude --libdirs "$root/lib:$core_lib:$jh/lib" "$tmp/probe.ss") || rc=$? ;; *) (cd "$tmp/hostile" && LD_LIBRARY_PATH="$tmp/hostile:$native_dir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \ JERBOA_LOADER_SENTINEL_MARKER="$marker" \ - "$jerbuild" exec --libdirs "$root/lib:$core_lib:$jh/lib" "$tmp/probe.ss") || rc=$? + "$jerbuild" exec --unsafe-prelude --libdirs "$root/lib:$core_lib:$jh/lib" "$tmp/probe.ss") || rc=$? ;; esac