Merge pull request #59 from DataDog/bryce.kahle/fix-tracefs-cleanup-self

Ensure we do not attempt to cleanup probes from ourself
DataDog · Nov 11, 2021 · 3709b75 · 3709b75
2 parents 95ceaf8 + be9a5c8
commit 3709b75
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/manager/manager.go b/manager/manager.go
@@ -1126,7 +1126,7 @@ func (m *Manager) UpdateActivatedProbes(selectors []ProbesSelector) error {
 		}
 	}
 
-	for id, _ := range nextProbes {
+	for id := range nextProbes {
 		if _, alreadyPresent := currentProbes[id]; alreadyPresent {
 			delete(currentProbes, id)
 		} else {
@@ -1524,7 +1524,7 @@ func (m *Manager) cleanupTracefs() error {
 
 	// clean up kprobe_events
 	var cleanUpErrors *multierror.Error
-	pidMask := make(map[int]procMask)
+	pidMask := map[int]procMask{os.Getpid(): Running}
 	cleanUpErrors = multierror.Append(cleanUpErrors, cleanupKprobeEvents(pattern, pidMask))
 	cleanUpErrors = multierror.Append(cleanUpErrors, cleanupUprobeEvents(pattern, pidMask))
 	if cleanUpErrors.Len() == 0 {