diff options
| author | Kevin Krakauer <krakauer@google.com> | 2018-05-15 14:55:29 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-05-15 14:56:18 -0700 |
| commit | 96c28a43682e8a665142da5b8b0734198fff3a00 (patch) | |
| tree | 503d6fab03f8598a7d56a61ba8e9ed5714965616 /pkg/sentry/kernel | |
| parent | 9889c29d6d26ba86b5e3590eac85bfb8393dd54e (diff) | |
sentry: Replaces saving of inet.Stack with retrieval via context.
Previously, inet.Stack was referenced in 2 structs in sentry/socket that can be
saved/restored. If an app is saved and restored on another machine, it may try
to use the old stack, which will have been replaced by a new stack on the new
machine.
PiperOrigin-RevId: 196733985
Change-Id: I6a8cfe73b5d7a90749734677dada635ab3389cb9
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/task.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/task.go b/pkg/sentry/kernel/task.go index 3d2e035e9..490f795c2 100644 --- a/pkg/sentry/kernel/task.go +++ b/pkg/sentry/kernel/task.go @@ -22,6 +22,7 @@ import ( "gvisor.googlesource.com/gvisor/pkg/bpf" "gvisor.googlesource.com/gvisor/pkg/sentry/arch" "gvisor.googlesource.com/gvisor/pkg/sentry/fs" + "gvisor.googlesource.com/gvisor/pkg/sentry/inet" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/auth" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/futex" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/sched" @@ -560,6 +561,8 @@ func (t *Task) Value(key interface{}) interface{} { return t.creds case fs.CtxRoot: return t.FSContext().RootDirectory() + case inet.CtxStack: + return t.NetworkContext() case ktime.CtxRealtimeClock: return t.k.RealtimeClock() case limits.CtxLimits: |