diff options
| author | Ophestra Umiker <cat@ophivana.moe> | 2024-10-25 13:19:37 +0900 |
|---|---|---|
| committer | Ophestra Umiker <cat@ophivana.moe> | 2024-10-25 13:19:37 +0900 |
| commit | 31350d74e51d25ee8b180a2d4234ea5d4aa55c2b (patch) | |
| tree | 3efe720bc128f251fbe7ccae71273675c47b8064 /internal/shim | |
| parent | 3b82cc55dea66c9c404c73b010203fd6a2c38cdb (diff) | |
shim: kill shim if setup becomes impossible
This prevents a hang when setup faults but the shim keeps waiting on the socket. Setup is automatically aborted when the shim is killed.
Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
Diffstat (limited to 'internal/shim')
| -rw-r--r-- | internal/shim/parent.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/internal/shim/parent.go b/internal/shim/parent.go index c6209fef..cf6b125d 100644 --- a/internal/shim/parent.go +++ b/internal/shim/parent.go @@ -4,7 +4,6 @@ import ( "encoding/gob" "errors" "net" - "os" "syscall" "git.ophivana.moe/security/fortify/acl" @@ -13,7 +12,7 @@ import ( // called in the parent process -func ServeConfig(socket string, abort chan error, uid int, payload *Payload, wl *Wayland) error { +func ServeConfig(socket string, abort chan error, killShim func(), uid int, payload *Payload, wl *Wayland) error { if payload.WL { if f, err := net.DialUnix("unix", nil, &net.UnixAddr{Name: wl.Path, Net: "unix"}); err != nil { return err @@ -58,7 +57,7 @@ func ServeConfig(socket string, abort chan error, uid int, payload *Payload, wl } else { if err = gob.NewEncoder(conn).Encode(*payload); err != nil { fmsg.Println("cannot stream shim payload:", err) - _ = os.Remove(socket) + killShim() return } @@ -67,6 +66,7 @@ func ServeConfig(socket string, abort chan error, uid int, payload *Payload, wl var rc syscall.RawConn if rc, err = wl.SyscallConn(); err != nil { fmsg.Println("cannot obtain raw wayland connection:", err) + killShim() return } else { go func() { @@ -74,6 +74,7 @@ func ServeConfig(socket string, abort chan error, uid int, payload *Payload, wl if err = rc.Control(func(fd uintptr) { if _, _, err = conn.WriteMsgUnix(nil, syscall.UnixRights(int(fd)), nil); err != nil { fmsg.Println("cannot pass wayland connection to shim:", err) + killShim() return } _ = conn.Close() |