diff --git a/VERSION-openeuler b/VERSION-openeuler index 08856f6..86bfb6f 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -18.09.0.240 +18.09.0.241 diff --git a/docker-engine-openeuler.spec b/docker-engine-openeuler.spec index 94a8fd4..5fe0b1f 100644 --- a/docker-engine-openeuler.spec +++ b/docker-engine-openeuler.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 240 +Release: 241 Summary: The open-source application container engine Group: Tools/Docker @@ -198,6 +198,12 @@ fi %endif %changelog +* Thu Sep 15 2022 chenjiankun - 18.09.0-241 +- Type:CVE +- CVE:CVE-2022-36109 +- SUG:NA +- DESC:fix CVE-2022-36109 + * Thu Sep 15 2022 chenjiankun - 18.09.0-240 - Type:bugfix - CVE:NA diff --git a/patch/0230-docker-AdditionalGids-must-include-effective-group-I.patch b/patch/0230-docker-AdditionalGids-must-include-effective-group-I.patch new file mode 100644 index 0000000..9706b80 --- /dev/null +++ b/patch/0230-docker-AdditionalGids-must-include-effective-group-I.patch @@ -0,0 +1,32 @@ +From 7f4258e2b8b9b769beab23246d27984ada539ac9 Mon Sep 17 00:00:00 2001 +From: chenjiankun +Date: Thu, 15 Sep 2022 10:33:12 +0800 +Subject: [PATCH] docker: AdditionalGids must include effective group ID + +otherwise this one won't be considered for permission checks + +Signed-off-by: Nicolas De Loof + +Conflict:daemon/oci_linux.go +Reference:https://github.com/moby/moby/commit/de7af816e76a7fd3fbf06bffa6832959289fba32 + +--- + components/engine/daemon/oci_linux.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/engine/daemon/oci_linux.go b/components/engine/daemon/oci_linux.go +index 6d3bc165..2b803955 100644 +--- a/components/engine/daemon/oci_linux.go ++++ b/components/engine/daemon/oci_linux.go +@@ -201,7 +201,7 @@ func getUser(c *container.Container, username string) (uint32, uint32, []uint32, + uid := uint32(execUser.Uid) + gid := uint32(execUser.Gid) + sgids := append(execUser.Sgids, addGroups...) +- var additionalGids []uint32 ++ additionalGids := []uint32{gid} + for _, g := range sgids { + additionalGids = append(additionalGids, uint32(g)) + } +-- +2.23.0 + diff --git a/series.conf b/series.conf index 5722e48..4d62520 100644 --- a/series.conf +++ b/series.conf @@ -223,4 +223,5 @@ patch/0226-docker-Lock-down-docker-root-dir-perms.patch patch/0227-docker-registry-ensure-default-auth-config-has-address.patch patch/0228-docker-fix-terminal-abnormal-after-docker-run.patch patch/0229-docker-Add-an-ExitPid-field-for-State-struct-to-reco.patch +patch/0230-docker-AdditionalGids-must-include-effective-group-I.patch #end