github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #211 from safing/fix/process-profile-deadlock

Browse Source 
Fix process/profile deadlock
This commit is contained in:
Daniel
2020-12-04 17:03:39 +01:00
committed by GitHub
parent d031335647 d9fcf8e64d
commit d206eca3fa
5 changed files with 37 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firewall/master.go
View File

@@ -150,10 +150,10 @@ func checkSelfCommunication(ctx context.Context, conn *network.Connection, pkt p
log.Tracer(ctx).Warningf("filter: failed to find local peer process PID: %s", err)
} else {
// get primary process
otherProcess, err := process.GetOrFindPrimaryProcess(ctx, otherPid)
otherProcess, err := process.GetOrFindProcess(ctx, otherPid)
if err != nil {
log.Tracer(ctx).Warningf("filter: failed to find load local peer process with PID %d: %s", otherPid, err)
} else if otherProcess.Pid == conn.Process().Pid {
} else if otherProcess.Path == conn.Process().Path {
conn.Accept("process internal connection", noReasonOptionKey)
conn.Internal = true
return true