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

Lock around packet mmap fields.

Browse Source 
Reported-by: syzbot+8c5b9e9c8d8461de5720@syzkaller.appspotmail.com
Reported-by: syzbot+c00a808d28d19d280100@syzkaller.appspotmail.com
Reported-by: syzbot+97cd0b713bc1200a6435@syzkaller.appspotmail.com
Reported-by: syzbot+818820ff483ccdfdba38@syzkaller.appspotmail.com
Reported-by: syzbot+e902091253f397e19066@syzkaller.appspotmail.com
Reported-by: syzbot+97a55be6c79e63dfdc08@syzkaller.appspotmail.com
Reported-by: syzbot+c6c25b1e0afa504bc315@syzkaller.appspotmail.com
PiperOrigin-RevId: 724055115
This commit is contained in:
Lucas Manning
2025-02-06 13:34:33 -08:00
committed by gVisor bot
parent a4a0e84b5c
commit da7cd03064
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tcpip/transport/packet/endpoint.go
+14 -4
View File
@@ -101,10 +101,10 @@ type endpoint struct {
// +checklocks:lastErrorMu
lastError tcpip.Error
packetMmapRxConfig *tcpip.TpacketReq
packetMmapTxConfig *tcpip.TpacketReq
packetMMapVersion tpacketVersion
packetMMapEp stack.PacketMMapEndpoint
// +checklocks:mu
packetMMapVersion tpacketVersion
// +checklocks:mu
packetMMapEp stack.PacketMMapEndpoint
}
// NewEndpoint returns a new packet endpoint.
@@ -367,9 +367,11 @@ func (ep *endpoint) Readiness(mask waiter.EventMask) waiter.EventMask {
// Determine whether the endpoint is readable.
if (mask & waiter.ReadableEvents) != 0 {
ep.mu.RLock()
if ep.packetMMapEp != nil {
result |= ep.packetMMapEp.Readiness(mask)
}
ep.mu.RUnlock()
ep.rcvMu.Lock()
if !ep.rcvList.Empty() || ep.rcvClosed {
result |= waiter.ReadableEvents
@@ -400,6 +402,8 @@ func (ep *endpoint) SetSockOpt(opt tcpip.SettableSocketOption) tcpip.Error {
// SetSockOptInt implements tcpip.Endpoint.SetSockOptInt.
func (ep *endpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) tcpip.Error {
ep.mu.Lock()
defer ep.mu.Unlock()
switch opt {
case tcpip.PacketMMapVersionOption:
// We support up to TPACKET_V2.
@@ -460,6 +464,8 @@ func (ep *endpoint) GetSockOptInt(opt tcpip.SockOptInt) (int, tcpip.Error) {
// handlePacket implements stack.PacketEndpoint.HandlePacket
func (ep *endpoint) HandlePacket(nicID tcpip.NICID, netProto tcpip.NetworkProtocolNumber, pkt *stack.PacketBuffer) {
ep.mu.RLock()
defer ep.mu.RUnlock()
if ep.packetMMapEp != nil {
ep.packetMMapEp.HandlePacket(nicID, netProto, pkt)
return
@@ -575,11 +581,15 @@ func (ep *endpoint) GetPacketMMapOpts(req *tcpip.TpacketReq, isRx bool) stack.Pa
// SetPacketMMapEndpoint implements
// stack.MappablePacketEndpoint.SetPacketMMapEndpoint.
func (ep *endpoint) SetPacketMMapEndpoint(m stack.PacketMMapEndpoint) {
ep.mu.Lock()
defer ep.mu.Unlock()
ep.packetMMapEp = m
}
// GetPacketMMapEndpoint implements
// stack.MappablePacketEndpoint.GetPacketMMapEndpoint.
func (ep *endpoint) GetPacketMMapEndpoint() stack.PacketMMapEndpoint {
ep.mu.RLock()
defer ep.mu.RUnlock()
return ep.packetMMapEp
}