Skip to content

Commit 7209f70

Browse files
committed
Fix "exit status 148"
We will upstream the change later. Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent 1dd419f commit 7209f70

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ tools/firecracker-builder-stamp: tools/docker/Dockerfile.firecracker-builder
291291

292292
$(FIRECRACKER_BIN) $(JAILER_BIN): $(FIRECRACKER_DIR)/Cargo.toml tools/firecracker-builder-stamp
293293
(cd $(FIRECRACKER_DIR) && patch -p1 < $(CURDIR)/vcpu-resume.patch)
294+
(cd $(FIRECRACKER_DIR) && patch -p1 < $(CURDIR)/whitelist-sigprocmask.patch)
294295
docker run --rm -it --user $(UID) \
295296
--volume $(CURDIR)/$(FIRECRACKER_DIR):/src \
296297
--volume $(CARGO_CACHE_VOLUME_NAME):/usr/local/cargo/registry \

whitelist-sigprocmask.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/src/vmm/src/default_syscalls/filters.rs b/src/vmm/src/default_syscalls/filters.rs
2+
index 91c2330..a98c3b5 100644
3+
--- a/src/vmm/src/default_syscalls/filters.rs
4+
+++ b/src/vmm/src/default_syscalls/filters.rs
5+
@@ -84,6 +84,10 @@ pub fn default_filter() -> Result<SeccompFilter, Error> {
6+
allow_syscall(libc::SYS_read),
7+
allow_syscall(libc::SYS_readv),
8+
allow_syscall(libc::SYS_recvfrom),
9+
+ // SYS_rt_sigprocmask is called by musl libc, originating in pthread_exit()
10+
+ // https://github.com/firecracker-microvm/firecracker/issues/1456
11+
+ #[cfg(target_env = "musl")]
12+
+ allow_syscall(libc::SYS_rt_sigprocmask),
13+
// SYS_rt_sigreturn is needed in case a fault does occur, so that the signal handler
14+
// can return. Otherwise we get stuck in a fault loop.
15+
allow_syscall(libc::SYS_rt_sigreturn),

0 commit comments

Comments
 (0)