diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-06 20:34:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-06 20:34:15 +0000 |
| commit | d80c5b0c6b44bb145788d699b8ffac109c5937d6 (patch) | |
| tree | 7ff5ca6054a625835c606216a0a4578cfffc285c /pkg/sentry/vfs | |
| parent | 57eb9dd84e0153bb1848c0246d86ef23d116d9a2 (diff) | |
| parent | 6fa5cee82c0f515b001dee5f3840e1f875b2f477 (diff) | |
Merge release-20200219.0-122-g6fa5cee (automated)
Diffstat (limited to 'pkg/sentry/vfs')
| -rwxr-xr-x | pkg/sentry/vfs/epoll_interest_list.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/sentry/vfs/epoll_interest_list.go b/pkg/sentry/vfs/epoll_interest_list.go index 011373f0f..1bd41f400 100755 --- a/pkg/sentry/vfs/epoll_interest_list.go +++ b/pkg/sentry/vfs/epoll_interest_list.go @@ -135,8 +135,9 @@ func (l *epollInterestList) InsertBefore(a, e *epollInterest) { // Remove removes e from l. func (l *epollInterestList) Remove(e *epollInterest) { - prev := epollInterestElementMapper{}.linkerFor(e).Prev() - next := epollInterestElementMapper{}.linkerFor(e).Next() + linker := epollInterestElementMapper{}.linkerFor(e) + prev := linker.Prev() + next := linker.Next() if prev != nil { epollInterestElementMapper{}.linkerFor(prev).SetNext(next) @@ -149,6 +150,9 @@ func (l *epollInterestList) Remove(e *epollInterest) { } else { l.tail = prev } + + linker.SetNext(nil) + linker.SetPrev(nil) } // Entry is a default implementation of Linker. Users can add anonymous fields |