From 8a9d69385024854321ba806ea09cc0bbe1af87c3 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 12 Oct 2022 22:06:58 +0000 Subject: [PATCH] [release/1.6] Stats() shouldn't assume s.container is non-nil Like other exported methods, Stats() shouldn't assume s.container is non-nil. Fixes #7468. Signed-off-by: Kazuyoshi Kato (cherry picked from commit 49a54e23cb2db8080c40383abcc180d45f0efea5) Signed-off-by: Kazuyoshi Kato --- runtime/v2/runc/v1/service.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go index 0c84c1403929..8c473430e218 100644 --- a/runtime/v2/runc/v1/service.go +++ b/runtime/v2/runc/v1/service.go @@ -597,7 +597,11 @@ func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*pt } func (s *service) Stats(ctx context.Context, r *taskAPI.StatsRequest) (*taskAPI.StatsResponse, error) { - cgx := s.container.Cgroup() + container, err := s.getContainer() + if err != nil { + return nil, err + } + cgx := container.Cgroup() if cgx == nil { return nil, errdefs.ToGRPCf(errdefs.ErrNotFound, "cgroup does not exist") }