netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't hold streamQueueReceiver.mu while calling RightsControlMessage.Release().

Browse Source 
This leads to lock order violations.

Reported-by: syzbot+c8a2ae926db29417b836@syzkaller.appspotmail.com
PiperOrigin-RevId: 530726950
This commit is contained in:
Nicolas Lacasse
2023-05-09 15:21:21 -07:00
committed by gVisor bot
parent 152fa5481e
commit 2044c34491
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/socket/unix/transport/unix.go
+11 -2
View File
@@ -504,6 +504,15 @@ func (q *streamQueueReceiver) RecvMaxQueueSize() int64 {
// Recv implements Receiver.Recv.
func (q *streamQueueReceiver) Recv(ctx context.Context, data [][]byte, wantCreds bool, numRights int, peek bool) (int64, int64, ControlMessages, bool, Address, bool, *syserr.Error) {
// RightsControlMessages must be released without q.mu held. We do this in a
// defer to simplify control flow logic.
var rightsToRelease []RightsControlMessage
defer func() {
for _, rcm := range rightsToRelease {
rcm.Release(ctx)
}
}()
q.mu.Lock()
defer q.mu.Unlock()
@@ -549,7 +558,7 @@ func (q *streamQueueReceiver) Recv(ctx context.Context, data [][]byte, wantCreds
var cmTruncated bool
if c.Rights != nil && numRights == 0 {
c.Rights.Release(ctx)
rightsToRelease = append(rightsToRelease, c.Rights)
c.Rights = nil
cmTruncated = true
}
@@ -604,7 +613,7 @@ func (q *streamQueueReceiver) Recv(ctx context.Context, data [][]byte, wantCreds
// Consume rights.
if numRights == 0 {
cmTruncated = true
q.control.Rights.Release(ctx)
rightsToRelease = append(rightsToRelease, q.control.Rights)
} else {
c.Rights = q.control.Rights
haveRights = true