summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/epoll
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-03-19 14:24:14 +0000
committergVisor bot <gvisor-bot@google.com>2020-03-19 14:24:14 +0000
commit5eedafe1b263f4b53d7b9c1fa805508674cd0b9e (patch)
tree57540b48f61e4c3475e0b7a2f7725a4d97c8fa12 /pkg/sentry/kernel/epoll
parent124b60768ba18a3fceee47dbb35f7409c44bf18f (diff)
parente9e399c25d4fcad2adfe92d73b192b9784774964 (diff)
Merge release-20200219.0-202-ge9e399c (automated)
Diffstat (limited to 'pkg/sentry/kernel/epoll')
-rw-r--r--pkg/sentry/kernel/epoll/epoll.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/epoll/epoll.go b/pkg/sentry/kernel/epoll/epoll.go
index 8bffb78fc..592650923 100644
--- a/pkg/sentry/kernel/epoll/epoll.go
+++ b/pkg/sentry/kernel/epoll/epoll.go
@@ -296,8 +296,10 @@ func (*readyCallback) Callback(w *waiter.Entry) {
e.waitingList.Remove(entry)
e.readyList.PushBack(entry)
entry.curList = &e.readyList
+ e.listsMu.Unlock()
e.Notify(waiter.EventIn)
+ return
}
e.listsMu.Unlock()