Merge pull request #2834 from acmcodercom/execrace

estesp · web-flow · commit 6bb83f21952d · 2018-11-26T17:27:54.000-05:00
fix race in exec delete and start(release/1.1)
diff --git a/linux/proc/exec_state.go b/linux/proc/exec_state.go
@@ -60,11 +60,11 @@ func (s *execCreatedState) Start(ctx context.Context) error {
 }
 
 func (s *execCreatedState) Delete(ctx context.Context) error {
+	s.p.mu.Lock()
+	defer s.p.mu.Unlock()
 	if err := s.p.delete(ctx); err != nil {
 		return err
 	}
-	s.p.mu.Lock()
-	defer s.p.mu.Unlock()
 	return s.transition("deleted")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ func (s *execCreatedState) Start(ctx context.Context) error {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func (s *execCreatedState) Delete(ctx context.Context) error {`
	`63`	`+ s.p.mu.Lock()`
	`64`	`+ defer s.p.mu.Unlock()`
`63`	`65`	`if err := s.p.delete(ctx); err != nil {`
`64`	`66`	`return err`
`65`	`67`	`}`
`66`		`- s.p.mu.Lock()`
`67`		`- defer s.p.mu.Unlock()`
`68`	`68`	`return s.transition("deleted")`
`69`	`69`	`}`
`70`	`70`