diff options
| author | Ian Gudger <igudger@google.com> | 2018-10-15 17:47:24 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-10-15 17:48:11 -0700 |
| commit | 167f2401c4abb1ebda1f4536a04d9854e9008e0b (patch) | |
| tree | dc9c7d33f0635039bf3ba45e912fb693f3a99812 /pkg/sentry/kernel | |
| parent | ecd94ea7a693d49a0edce8607241a8e2ac22bfe0 (diff) | |
Merge host.endpoint into host.ConnectedEndpoint
host.endpoint contained duplicated logic from the sockerpair implementation and
host.ConnectedEndpoint. Remove host.endpoint in favor of a
host.ConnectedEndpoint wrapped in a socketpair end.
PiperOrigin-RevId: 217240096
Change-Id: I4a3d51e3fe82bdf30e2d0152458b8499ab4c987c
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/kernel.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/kernel/task.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go index 238fd127b..cc664deec 100644 --- a/pkg/sentry/kernel/kernel.go +++ b/pkg/sentry/kernel/kernel.go @@ -591,6 +591,8 @@ func (ctx *createProcessContext) Value(key interface{}) interface{} { return ctx.k case uniqueid.CtxGlobalUniqueID: return ctx.k.UniqueID() + case uniqueid.CtxGlobalUniqueIDProvider: + return ctx.k case uniqueid.CtxInotifyCookie: return ctx.k.GenerateInotifyCookie() default: @@ -1045,6 +1047,8 @@ func (ctx supervisorContext) Value(key interface{}) interface{} { return ctx.k case uniqueid.CtxGlobalUniqueID: return ctx.k.UniqueID() + case uniqueid.CtxGlobalUniqueIDProvider: + return ctx.k case uniqueid.CtxInotifyCookie: return ctx.k.GenerateInotifyCookie() default: diff --git a/pkg/sentry/kernel/task.go b/pkg/sentry/kernel/task.go index 07ad1614c..4f0b7fe3f 100644 --- a/pkg/sentry/kernel/task.go +++ b/pkg/sentry/kernel/task.go @@ -590,6 +590,8 @@ func (t *Task) Value(key interface{}) interface{} { return t.k case uniqueid.CtxGlobalUniqueID: return t.k.UniqueID() + case uniqueid.CtxGlobalUniqueIDProvider: + return t.k case uniqueid.CtxInotifyCookie: return t.k.GenerateInotifyCookie() default: |