Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix data race in packetmmap endpoint. #11460

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

Fix data race in packetmmap endpoint. #11460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/sentry/socket/netstack/packetmmap/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ type Endpoint struct {

// +checklocks:mu
mode ringBufferMode
// +checklocks:mu
cooked bool

cooked bool
packetEP stack.MappablePacketEndpoint
reserve uint32
nicID tcpip.NICID
Expand Down Expand Up @@ -196,6 +197,7 @@ func (m *Endpoint) HandlePacket(nicID tcpip.NICID, netProto tcpip.NetworkProtoco
m.stack.Stats().DroppedPackets.Increment()
return
}
isCooked := m.cooked
m.mu.Unlock()

if pkt.GSOOptions.Type != stack.GSONone && pkt.GSOOptions.NeedsCsum {
Expand All @@ -206,7 +208,7 @@ func (m *Endpoint) HandlePacket(nicID tcpip.NICID, netProto tcpip.NetworkProtoco
}

pktBuf := pkt.ToBuffer()
if m.cooked {
if isCooked {
pktBuf.TrimFront(int64(len(pkt.LinkHeader().Slice()) + len(pkt.VirtioNetHeader().Slice())))
// Cooked packet endpoints don't include the link-headers in received
// packets.
Expand Down