diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2019-04-10 16:35:22 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-04-10 16:36:28 -0700 |
| commit | d93d19fd4eefdfd868919a73c9498e7da7eb9258 (patch) | |
| tree | 79add4ec602cae3a44b551daca485ae3766e6f0b /pkg/sentry/kernel/kernel.go | |
| parent | c8368e477b8f2dedaadacbd6efbb455879c9b1d6 (diff) | |
Fix uses of RootFromContext.
RootFromContext can return a dirent with reference taken, or nil. We must call
DecRef if (and only if) a real dirent is returned.
PiperOrigin-RevId: 242965515
Change-Id: Ie2b7b4cb19ee09b6ccf788b71f3fd7efcdf35a11
Diffstat (limited to 'pkg/sentry/kernel/kernel.go')
| -rw-r--r-- | pkg/sentry/kernel/kernel.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go index a9994f23b..b8953657c 100644 --- a/pkg/sentry/kernel/kernel.go +++ b/pkg/sentry/kernel/kernel.go @@ -676,6 +676,10 @@ func (k *Kernel) CreateProcess(args CreateProcessArgs) (*ThreadGroup, ThreadID, root := args.Root if root == nil { root = fs.RootFromContext(ctx) + // Is the root STILL nil? + if root == nil { + return nil, 0, fmt.Errorf("CreateProcessArgs.Root was not provided, and failed to get root from context") + } } defer root.DecRef() args.Root = nil |