Skip to content

user: fix concurrent map read and map write #467 #468

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

Merged
cfc4n merged 1 commit into from
Jan 26, 2024
Merged

user: fix concurrent map read and map write #467 #468

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
10 changes: 9 additions & 1 deletion user/module/probe_openssl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ type MOpenSSLProbe struct {
eventMaps []*ebpf.Map

// pid[fd:Addr]
pidConns map[uint32]map[uint32]string
pidConns map[uint32]map[uint32]string
pidLocker sync.Locker

keyloggerFilename string
keylogger *os.File
Expand All @@ -85,6 +86,7 @@ func (m *MOpenSSLProbe) Init(ctx context.Context, logger *log.Logger, conf confi
m.eventMaps = make([]*ebpf.Map, 0, 2)
m.eventFuncMaps = make(map[*ebpf.Map]event.IEventStruct)
m.pidConns = make(map[uint32]map[uint32]string)
m.pidLocker = new(sync.Mutex)
m.masterKeys = make(map[string]bool)
m.sslVersionBpfMap = make(map[string]string)

Expand Down Expand Up @@ -289,6 +291,8 @@ func (m *MOpenSSLProbe) AddConn(pid, fd uint32, addr string) {
// save
var connMap map[uint32]string
var f bool
m.pidLocker.Lock()
defer m.pidLocker.Unlock()
connMap, f = m.pidConns[pid]
if !f {
connMap = make(map[uint32]string)
Expand All @@ -307,6 +311,8 @@ func (m *MOpenSSLProbe) DelConn(pid, fd uint32) {
if pid == 0 {
return
}
m.pidLocker.Lock()
defer m.pidLocker.Unlock()
if fd == 0 {
delete(m.pidConns, pid)
}
Expand All @@ -328,6 +334,8 @@ func (m *MOpenSSLProbe) GetConn(pid, fd uint32) string {
var connMap map[uint32]string
var f bool
//m.logger.Printf("%s\tGetConn pid:%d, fd:%d, mapinfo:%v\n", m.Name(), pid, fd, m.pidConns)
m.pidLocker.Lock()
defer m.pidLocker.Unlock()
connMap, f = m.pidConns[pid]
if !f {
return ConnNotFound
Expand Down