From de0c2277d60f702817e0bed94c887d170bf5d5ea Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 29 Mar 2023 10:16:41 -0700 Subject: [PATCH 1/5] [1.1] CHANGELOG: fix 1.1.5 git compare link Signed-off-by: Kir Kolyshkin --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 713a221a5bb..2b8a01c7ed2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -346,7 +346,7 @@ implementation (libcontainer) is *not* covered by this policy. [Unreleased 1.1.z]: https://github.com/opencontainers/runc/compare/v1.1.5...release-1.1 -[1.1.5]: https://github.com/opencontainers/runc/compare/v1.1.3...v1.1.5 +[1.1.5]: https://github.com/opencontainers/runc/compare/v1.1.4...v1.1.5 [1.1.4]: https://github.com/opencontainers/runc/compare/v1.1.3...v1.1.4 [1.1.3]: https://github.com/opencontainers/runc/compare/v1.1.2...v1.1.3 [1.1.2]: https://github.com/opencontainers/runc/compare/v1.1.1...v1.1.2 From 37e586aba40f41caf79298b1998bdbd03970ce69 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 29 Mar 2023 14:25:44 -0700 Subject: [PATCH 2/5] CHANGELOG: fix a typo Found by codespell. Signed-off-by: Kir Kolyshkin --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b8a01c7ed2..536030ebe61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Fix the inability to use `/dev/null` when inside a container. (#3620) * Fix changing the ownership of host's `/dev/null` caused by fd redirection (a regression in 1.1.1). (#3674, #3731) -* Fix rare runc exec/enter unshare error on older kernels, inlcuding +* Fix rare runc exec/enter unshare error on older kernels, including CentOS < 7.7. (#3776) * nsexec: Check for errors in `write_log()`. (#3721) * Various CI fixes and updates. (#3618, #3630, #3640, #3729) From 7b3ac330f74cc00923bdd876b7ae4e44c7d76847 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 30 Mar 2023 16:36:42 -0700 Subject: [PATCH 3/5] verify-changelog: allow non-ASCII Previously (see commit 91fa032da406f16abcb3) we found a few issues using this check, but apparently the CHANGELOG.md is in UTF-8, and the recently added quote is breaking this, so remove. Signed-off-by: Kir Kolyshkin --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index cf82c0cae89..e336b78c9e1 100644 --- a/Makefile +++ b/Makefile @@ -146,8 +146,6 @@ vendor: $(GO) mod verify verify-changelog: - # No non-ASCII characters. - ! LC_ALL=C grep -n -P '[\x80-\xFF]' CHANGELOG.md # No space at EOL. ! grep -n '\s$$' CHANGELOG.md # Period before issue/PR references. From 54cfb25d696964fdcca8b27a8c9242a001139d96 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 29 Mar 2023 14:49:12 -0700 Subject: [PATCH 4/5] Makefile: add verify-changelog as release dependency ... as a way to maybe catch some CHANGELOG.md bugs at the last moment. Signed-off-by: Kir Kolyshkin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e336b78c9e1..635d272094c 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ release: runcimage $(RUNC_IMAGE) make localrelease script/release_sign.sh -S $(GPG_KEYID) -r release/$(VERSION) -v $(VERSION) -localrelease: +localrelease: verify-changelog script/release_build.sh -r release/$(VERSION) -v $(VERSION) $(RELEASE_ARGS) dbuild: runcimage From 822623b6a02334dc0b65a5ce653daafbf5cb0eba Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 30 Mar 2023 16:47:28 -0700 Subject: [PATCH 5/5] CHANGELOG.md: move 1.1.5 CVEs to Security section Signed-off-by: Aleksa Sarai Signed-off-by: Kir Kolyshkin --- CHANGELOG.md | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 536030ebe61..e1419c6337c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,12 +11,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 > 囚われた屈辱は > 反撃の嚆矢だ +### Security + +The following CVEs were fixed in this release: + +* [CVE-2023-25809][] is a vulnerability involving rootless containers where + (under specific configurations), the container would have write access to the + `/sys/fs/cgroup/user.slice/...` cgroup hierarchy. No other hierarchies on the + host were affected. This vulnerability was discovered by Akihiro Suda. + +* [CVE-2023-27561][] was a regression in our protections against tricky `/proc` + and `/sys` configurations (where the container mountpoint is a symlink) + causing us to be tricked into incorrectly configuring the container, which + effectively re-introduced [CVE-2019-19921][]. This regression was present + from v1.0.0-rc95 to v1.1.4 and was discovered by @Beuc. (#3785) + +* [CVE-2023-28642][] is a different attack vector using the same regression + as in [CVE-2023-27561][]. This was reported by Lei Wang. + +[CVE-2019-19921]: https://github.com/advisories/GHSA-fh74-hm69-rqjw +[CVE-2023-25809]: https://github.com/opencontainers/runc/security/advisories/GHSA-m8cg-xc2p-r3fc +[CVE-2023-27561]: https://github.com/advisories/GHSA-vpvm-3wq2-2wvm +[CVE-2023-28642]: https://github.com/opencontainers/runc/security/advisories/GHSA-g2j6-57v7-gm8c + ### Fixed -* Prohibit container's `/proc` and `/sys` to be symlinks (CVE-2019-19921, - CVE-2023-27561, CVE-2023-28642, #3785) -* rootless: rework /sys/fs/cgroup mounts to avoid exposing the host's cgroup - hierarchy into the container. (CVE-2023-25809) * Fix the inability to use `/dev/null` when inside a container. (#3620) * Fix changing the ownership of host's `/dev/null` caused by fd redirection (a regression in 1.1.1). (#3674, #3731)