From 506552a88bd3455e80a9b3829568e94ec0160309 Mon Sep 17 00:00:00 2001 From: "hang.jiang" Date: Fri, 1 Sep 2023 16:17:13 +0800 Subject: [PATCH 1/8] Fix File to Close (This is a cherry-pick of 937ca107c3d22da77eb8e8030f2342253b980980.) Signed-off-by: hang.jiang Fixes: GHSA-xr7r-f8xq-vfvv CVE-2024-21626 Signed-off-by: Aleksa Sarai --- libcontainer/cgroups/fs/paths.go | 1 + update.go | 1 + 2 files changed, 2 insertions(+) diff --git a/libcontainer/cgroups/fs/paths.go b/libcontainer/cgroups/fs/paths.go index 1092331b25d8..2cb970a3d55b 100644 --- a/libcontainer/cgroups/fs/paths.go +++ b/libcontainer/cgroups/fs/paths.go @@ -83,6 +83,7 @@ func tryDefaultCgroupRoot() string { if err != nil { return "" } + defer dir.Close() names, err := dir.Readdirnames(1) if err != nil { return "" diff --git a/update.go b/update.go index 9ce5a2e835b2..6d582ddddecb 100644 --- a/update.go +++ b/update.go @@ -174,6 +174,7 @@ other options are ignored. if err != nil { return err } + defer f.Close() } err = json.NewDecoder(f).Decode(&r) if err != nil { -- 2.43.0