Fix GoLand analyzer errors under runsc/...

PiperOrigin-RevId: 384344990

2 files changed, 7 insertions, 8 deletions

diff --git a/runsc/cgroup/cgroup.go b/runsc/cgroup/cgroup.go
index 66a6a0f68..5dbf14376 100644
--- a/runsc/cgroup/cgroup.go
+++ b/runsc/cgroup/cgroup.go
@@ -424,10 +424,9 @@ func (c *Cgroup) Uninstall() error {
 // restores cgroup to the original state.
 func (c *Cgroup) Join() (func(), error) {
 	// First save the current state so it can be restored.
-	undo := func() {}
 	paths, err := loadPaths("self")
 	if err != nil {
-		return undo, err
+		return nil, err
 	}
 	var undoPaths []string
 	for ctrlr, path := range paths {
@@ -438,8 +437,7 @@ func (c *Cgroup) Join() (func(), error) {
 		}
 	}
 
-	// Replace empty undo with the real thing before changes are made to cgroups.
-	undo = func() {
+	cu := cleanup.Make(func() {
 		for _, path := range undoPaths {
 			log.Debugf("Restoring cgroup %q", path)
 			// Writing the value 0 to a cgroup.procs file causes
@@ -449,7 +447,8 @@ func (c *Cgroup) Join() (func(), error) {
 				log.Warningf("Error restoring cgroup %q: %v", path, err)
 			}
 		}
-	}
+	})
+	defer cu.Clean()
 
 	// Now join the cgroups.
 	for key, ctrlr := range controllers {
@@ -461,10 +460,10 @@ func (c *Cgroup) Join() (func(), error) {
 			if ctrlr.optional() && os.IsNotExist(err) {
 				continue
 			}
-			return undo, err
+			return nil, err
 		}
 	}
-	return undo, nil
+	return cu.Release(), nil
 }
 
 // CPUQuota returns the CFS CPU quota.
diff --git a/runsc/cgroup/cgroup_test.go b/runsc/cgroup/cgroup_test.go
index eba40621e..1431b4e8f 100644
--- a/runsc/cgroup/cgroup_test.go
+++ b/runsc/cgroup/cgroup_test.go
@@ -800,7 +800,7 @@ func TestLoadPaths(t *testing.T) {
 				if err != nil {
 					t.Fatalf("Unexpected error: %v", err)
 				}
-			} else if !strings.Contains(err.Error(), tc.err) {
+			} else if err == nil || !strings.Contains(err.Error(), tc.err) {
 				t.Fatalf("Wrong error message, want: *%s*, got: %v", tc.err, err)
 			}
 			for key, vWant := range tc.want {