diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-01-17 23:43:32 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-01-17 23:43:32 +0900 |
| commit | ea8f228af36b2c9ae9918f7760c3af4f1e21cfa2 (patch) | |
| tree | 1f9b43cd1a0f83217f20e76924b8ae48e182cf0c /internal/app | |
| parent | 16db3dabe2060d5a66948101e16709697bfb374a (diff) | |
proc/priv/shim: merge shim into main program
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/app')
| -rw-r--r-- | internal/app/app.go | 4 | ||||
| -rw-r--r-- | internal/app/start.go | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/internal/app/app.go b/internal/app/app.go index 175c315a..0da8148b 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -5,9 +5,9 @@ import ( "sync" "sync/atomic" - "git.gensokyo.uk/security/fortify/cmd/fshim/ipc/shim" "git.gensokyo.uk/security/fortify/fst" "git.gensokyo.uk/security/fortify/internal/linux" + "git.gensokyo.uk/security/fortify/internal/proc/priv/shim" ) type App interface { @@ -23,7 +23,7 @@ type App interface { type RunState struct { // Start is true if fsu is successfully started. Start bool - // ExitCode is the value returned by fshim. + // ExitCode is the value returned by shim. ExitCode int // WaitErr is error returned by the underlying wait syscall. WaitErr error diff --git a/internal/app/start.go b/internal/app/start.go index 6fffda55..630f5194 100644 --- a/internal/app/start.go +++ b/internal/app/start.go @@ -9,10 +9,9 @@ import ( "strings" "time" - shim0 "git.gensokyo.uk/security/fortify/cmd/fshim/ipc" - "git.gensokyo.uk/security/fortify/cmd/fshim/ipc/shim" "git.gensokyo.uk/security/fortify/helper" "git.gensokyo.uk/security/fortify/internal/fmsg" + "git.gensokyo.uk/security/fortify/internal/proc/priv/shim" "git.gensokyo.uk/security/fortify/internal/state" "git.gensokyo.uk/security/fortify/internal/system" ) @@ -51,7 +50,7 @@ func (a *app) Run(ctx context.Context, rs *RunState) error { uint32(a.seal.sys.UID()), a.seal.sys.user.as, a.seal.sys.user.supp, - &shim0.Payload{ + &shim.Payload{ Argv: a.seal.command, Exec: shimExec, Bwrap: a.seal.sys.bwrap, |