v2: Prevent killing all container processes when exec is failed

If an exec is failed(such as executable file not found in $PATH), the `execs.id` will be empty. This leads to all the container processes being killed when calling `Kill` on such exec id. Fixes: #2001 Signed-off-by: Li Yuxuan <[email protected]>
kata-containers · Aug 29, 2019 · 179485f · 179485f
1 parent 7e77b75
commit 179485f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/containerd-shim-v2/service.go b/containerd-shim-v2/service.go
@@ -674,6 +674,14 @@ func (s *service) Kill(ctx context.Context, r *taskAPI.KillRequest) (_ *ptypes.E
 			return nil, err
 		}
 		processID = execs.id
+		if processID == "" {
+			logrus.WithFields(logrus.Fields{
+				"sandbox":   s.sandbox.ID(),
+				"Container": c.id,
+				"ExecID":    r.ExecID,
+			}).Debug("Id of exec process to be signalled is empty")
+			return empty, errors.New("The exec process does not exist")
+		}
 	}
 
 	return empty, s.sandbox.SignalProcess(c.id, processID, signum, r.All)