diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-01-19 18:38:13 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-01-19 18:38:13 +0900 |
| commit | 2f705068658bf9c47a5fa829105111e46a7732a0 (patch) | |
| tree | 4f75a66cb84cf5452c865afbdb9784adfded79b3 /internal/proc/priv/shim/main.go | |
| parent | cae567c1090ef12e9837f7dec4f43d030ec8f6b2 (diff) | |
helper/bwrap: move sync to helper state
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/proc/priv/shim/main.go')
| -rw-r--r-- | internal/proc/priv/shim/main.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/internal/proc/priv/shim/main.go b/internal/proc/priv/shim/main.go index 85a425bf..49ec7f1a 100644 --- a/internal/proc/priv/shim/main.go +++ b/internal/proc/priv/shim/main.go @@ -62,8 +62,9 @@ func Main() { } // restore bwrap sync fd + var syncFd *os.File if payload.Sync != nil { - payload.Bwrap.SetSync(os.NewFile(*payload.Sync, "sync")) + syncFd = os.NewFile(*payload.Sync, "sync") } // close setup socket @@ -134,8 +135,11 @@ func Main() { conf.Symlink("fortify", innerInit) helper.BubblewrapName = payload.Exec[0] // resolved bwrap path by parent - if b, err := helper.NewBwrap(conf, nil, innerInit, - func(int, int) []string { return make([]string, 0) }); err != nil { + if b, err := helper.NewBwrap( + conf, innerInit, + nil, func(int, int) []string { return make([]string, 0) }, + syncFd, + ); err != nil { fmsg.Fatalf("malformed sandbox config: %v", err) } else { cmd := b.Unwrap() |