diff options
| author | Zyad A. Ali <zyad.ali.me@gmail.com> | 2021-08-11 21:24:10 +0200 |
|---|---|---|
| committer | Zyad A. Ali <zyad.ali.me@gmail.com> | 2021-09-17 11:16:25 +0200 |
| commit | bcef079ec24d56d37a670c4c4149c638be6fb110 (patch) | |
| tree | afcc54ea1f5ce50dbf7e2b94f8b59738f6df7125 /pkg/sentry/kernel/task_context.go | |
| parent | e452ecd49526f4a0bbacc462840fbc6e88781e36 (diff) | |
Move CtxIPCNamespace to kernel/ipc package.
CtxIPCNamespace is needed by mqfs package to be able to retreive an
IPCNamespace using ctx.Value. As ctx.Value compares keys as interfaces,
we need to use type kernel.contextID in package mqfs, which is not
possible due to circular depenedency, so move it to kernel/ipc instead.
Updates #136
Diffstat (limited to 'pkg/sentry/kernel/task_context.go')
| -rw-r--r-- | pkg/sentry/kernel/task_context.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_context.go b/pkg/sentry/kernel/task_context.go index c82d9e82b..cb9bcd7c0 100644 --- a/pkg/sentry/kernel/task_context.go +++ b/pkg/sentry/kernel/task_context.go @@ -23,6 +23,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" + "gvisor.dev/gvisor/pkg/sentry/kernel/ipc" ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" "gvisor.dev/gvisor/pkg/sentry/limits" "gvisor.dev/gvisor/pkg/sentry/pgalloc" @@ -73,7 +74,7 @@ func (t *Task) contextValue(key interface{}, isTaskGoroutine bool) interface{} { defer t.mu.Unlock() } return t.utsns - case CtxIPCNamespace: + case ipc.CtxIPCNamespace: if !isTaskGoroutine { t.mu.Lock() defer t.mu.Unlock() |