Skip to content

Commit 750a254

Browse files
Bump github.com/opencontainers/runc from 1.1.13 to 1.2.0 in /tests/e2e-kubernetes (#432)
Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.13 to 1.2.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/opencontainers/runc/releases">github.com/opencontainers/runc's releases</a>.</em></p> <blockquote> <h2>runc v1.2.0 -- &quot;できるときにできることをやるんだ。それが今だ。&quot;</h2> <p>This is the long-awaited release of runc 1.2.0! The primary changes from rc3 are general improvements and fixes for minor regressions related to the new /proc/self/exe cloning logic in runc 1.2, follow-on patches related to CVE-2024-45310, as well as some other minor changes.</p> <ul> <li>In order to alleviate the remaining concerns around the memory usage and (arguably somewhat unimportant, but measurable) performance overhead of memfds for cloning <code>/proc/self/exe</code>, we have added a new protection using <code>overlayfs</code> that is used if you have enough privileges and the running kernel supports it. It has effectively no performance nor memory overhead (compared to no cloning at all). (<a href="https://redirect.github.com/opencontainers/runc/issues/4448">#4448</a>)</li> <li>The original fix for <a href="https://github.com/opencontainers/runc/security/advisories/GHSA-jfvp-7x6p-h2pv">CVE-2024-45310</a> was intentionally very limited in scope to make it easier to review, however it also did not handle all possible <code>os.MkdirAll</code> cases and thus could lead to regressions. We have switched to the more complete implementation in the newer versions of <code>github.com/cyphar/filepath-securejoin</code>. (<a href="https://redirect.github.com/opencontainers/runc/issues/4393">#4393</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4400">#4400</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4421">#4421</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4430">#4430</a>)</li> <li>In certain situations (a system with lots of mounts or racing mounts) we could accidentally end up leaking mounts from the container into the host. This has been fixed. (<a href="https://redirect.github.com/opencontainers/runc/issues/4417">#4417</a>)</li> <li>The fallback logic for <code>O_TMPFILE</code> clones of <code>/proc/self/exe</code> had a minor bug that would cause us to miss non-<code>noexec</code> directories and thus fail to start containers on some systems. (<a href="https://redirect.github.com/opencontainers/runc/issues/4444">#4444</a>)</li> <li>Sometimes the cloned <code>/proc/self/exe</code> file descriptor could be placed in a way that it would get clobbered by the Go runtime. We had a fix for this already but it turns out it could still break in rare circumstances, but it has now been fixed. (<a href="https://redirect.github.com/opencontainers/runc/issues/4294">#4294</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4452">#4452</a>)</li> <li>It is not possible for <code>runc kill</code> to work properly in some specific configurations (such as rootless containers with no cgroups and a shared pid namespace). We now output a warning for such configurations. (<a href="https://redirect.github.com/opencontainers/runc/issues/4398">#4398</a>)</li> <li>memfd-bind: update the documentation and make path handling with the systemd unit more idiomatic. (<a href="https://redirect.github.com/opencontainers/runc/issues/4428">#4428</a>)</li> <li>We now use v0.16 of Cilium's eBPF library, including fixes that quite a few downstreams asked for. (<a href="https://redirect.github.com/opencontainers/runc/issues/4397">#4397</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4396">#4396</a>)</li> <li>Some internal <code>runc init</code> synchronisation that was no longer necessary (due to the <code>/proc/self/exe</code> cloning move to Go) was removed. (<a href="https://redirect.github.com/opencontainers/runc/issues/4441">#4441</a>)</li> </ul> <h3>Static Linking Notices</h3> <p>The <code>runc</code> binary distributed with this release are <em>statically linked</em> with the following <a href="https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html">GNU LGPL-2.1</a> licensed libraries, with <code>runc</code> acting as a &quot;work that uses the Library&quot;:</p> <ul> <li><a href="https://github.com/seccomp/libseccomp">libseccomp</a></li> </ul> <p>The versions of these libraries were not modified from their upstream versions, but in order to comply with the LGPL-2.1 (§6(a)), we have attached the</p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/opencontainers/runc/blob/main/CHANGELOG.md">github.com/opencontainers/runc's changelog</a>.</em></p> <blockquote> <h2>[1.2.0] - 2024-10-22</h2> <blockquote> <p>できるときにできることをやるんだ。それが今だ。</p> </blockquote> <h3>Added</h3> <ul> <li>In order to alleviate the remaining concerns around the memory usage and (arguably somewhat unimportant, but measurable) performance overhead of memfds for cloning <code>/proc/self/exe</code>, we have added a new protection using <code>overlayfs</code> that is used if you have enough privileges and the running kernel supports it. It has effectively no performance nor memory overhead (compared to no cloning at all). (<a href="https://redirect.github.com/opencontainers/runc/issues/4448">#4448</a>)</li> </ul> <h3>Fixed</h3> <ul> <li>The original fix for <a href="https://github.com/opencontainers/runc/security/advisories/GHSA-jfvp-7x6p-h2pv">CVE-2024-45310</a> was intentionally very limited in scope to make it easier to review, however it also did not handle all possible <code>os.MkdirAll</code> cases and thus could lead to regressions. We have switched to the more complete implementation in the newer versions of <code>github.com/cyphar/filepath-securejoin</code>. (<a href="https://redirect.github.com/opencontainers/runc/issues/4393">#4393</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4400">#4400</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4421">#4421</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4430">#4430</a>)</li> <li>In certain situations (a system with lots of mounts or racing mounts) we could accidentally end up leaking mounts from the container into the host. This has been fixed. (<a href="https://redirect.github.com/opencontainers/runc/issues/4417">#4417</a>)</li> <li>The fallback logic for <code>O_TMPFILE</code> clones of <code>/proc/self/exe</code> had a minor bug that would cause us to miss non-<code>noexec</code> directories and thus fail to start containers on some systems. (<a href="https://redirect.github.com/opencontainers/runc/issues/4444">#4444</a>)</li> <li>Sometimes the cloned <code>/proc/self/exe</code> file descriptor could be placed in a way that it would get clobbered by the Go runtime. We had a fix for this already but it turns out it could still break in rare circumstances, but it has now been fixed. (<a href="https://redirect.github.com/opencontainers/runc/issues/4294">#4294</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4452">#4452</a>)</li> </ul> <h3>Changed</h3> <ul> <li>It is not possible for <code>runc kill</code> to work properly in some specific configurations (such as rootless containers with no cgroups and a shared pid namespace). We now output a warning for such configurations. (<a href="https://redirect.github.com/opencontainers/runc/issues/4398">#4398</a>)</li> <li>memfd-bind: update the documentation and make path handling with the systemd unit more idiomatic. (<a href="https://redirect.github.com/opencontainers/runc/issues/4428">#4428</a>)</li> <li>We now use v0.16 of Cilium's eBPF library, including fixes that quite a few downstreams asked for. (<a href="https://redirect.github.com/opencontainers/runc/issues/4397">#4397</a>, <a href="https://redirect.github.com/opencontainers/runc/issues/4396">#4396</a>)</li> <li>Some internal <code>runc init</code> synchronisation that was no longer necessary (due to the <code>/proc/self/exe</code> cloning move to Go) was removed. (<a href="https://redirect.github.com/opencontainers/runc/issues/4441">#4441</a>)</li> </ul> <h2>[1.2.0-rc.3] - 2024-09-02</h2> <blockquote> <p>The supreme happiness of life is the conviction that we are loved.</p> </blockquote> <h3>Security</h3> <ul> <li>Fix <a href="https://github.com/opencontainers/runc/security/advisories/GHSA-jfvp-7x6p-h2pv">CVE-2024-45310</a>, a low-severity attack that allowed maliciously configured containers to create empty files and directories on</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/opencontainers/runc/commit/0b9fa21be2bcba45f6d9d748b4bcf70cfbffbc19"><code>0b9fa21</code></a> VERSION: release v1.2.0</li> <li><a href="https://github.com/opencontainers/runc/commit/5190d6124bd65d92468abad364660e5a2978f149"><code>5190d61</code></a> Merge pull request <a href="https://redirect.github.com/opencontainers/runc/issues/4452">#4452</a> from lifubang/fix-fd-reuse-race</li> <li><a href="https://github.com/opencontainers/runc/commit/ca45a2c52db89dd3dbf04fb10964aa7a7e3e4959"><code>ca45a2c</code></a> merge <a href="https://redirect.github.com/opencontainers/runc/issues/4446">#4446</a> into opencontainers/runc:main</li> <li><a href="https://github.com/opencontainers/runc/commit/568231cc4ef4b0c20ff50185c006d48827903fe4"><code>568231c</code></a> Revert &quot;increase memory.max in cgroups.bats&quot;</li> <li><a href="https://github.com/opencontainers/runc/commit/e66992669172d1b5a10e553dc40a7c1853097d85"><code>e669926</code></a> fix an error caused by fd reuse race when starting runc init</li> <li><a href="https://github.com/opencontainers/runc/commit/ca8ca3ce07403327ecc998cf031b3ec9d22d8c63"><code>ca8ca3c</code></a> Merge pull request <a href="https://redirect.github.com/opencontainers/runc/issues/4448">#4448</a> from cyphar/cloned-binary-overlayfs</li> <li><a href="https://github.com/opencontainers/runc/commit/08faf151069ed3a54f5d2b2770c09ee644c9d703"><code>08faf15</code></a> Merge pull request <a href="https://redirect.github.com/opencontainers/runc/issues/4429">#4429</a> from kolyshkin/cap-load</li> <li><a href="https://github.com/opencontainers/runc/commit/515f09f7b1dbd442298132592c7e9689b855dbdf"><code>515f09f</code></a> dmz: use overlayfs to write-protect /proc/self/exe if possible</li> <li><a href="https://github.com/opencontainers/runc/commit/8cfbccb6d99a1bcfad5b16fb3f0bbca97cb5be4c"><code>8cfbccb</code></a> tests: integration: add helper to check if we're in a userns</li> <li><a href="https://github.com/opencontainers/runc/commit/8bebdbafd8e5199d7734747a91ba7e8dd369aca8"><code>8bebdba</code></a> Merge pull request <a href="https://redirect.github.com/opencontainers/runc/issues/4456">#4456</a> from kolyshkin/misc-ci-cleanups</li> <li>Additional commits viewable in <a href="https://github.com/opencontainers/runc/compare/v1.1.13...v1.2.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/opencontainers/runc&package-manager=go_modules&previous-version=1.1.13&new-version=1.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/awslabs/mountpoint-s3-csi-driver/network/alerts). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 315d7a1 commit 750a254

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

tests/e2e-kubernetes/go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ require (
5858
github.com/go-openapi/jsonreference v0.20.2 // indirect
5959
github.com/go-openapi/swag v0.22.4 // indirect
6060
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
61-
github.com/godbus/dbus/v5 v5.1.0 // indirect
6261
github.com/gogo/protobuf v1.3.2 // indirect
6362
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6463
github.com/golang/protobuf v1.5.4 // indirect
@@ -80,20 +79,19 @@ require (
8079
github.com/mailru/easyjson v0.7.7 // indirect
8180
github.com/moby/spdystream v0.4.0 // indirect
8281
github.com/moby/sys/mountinfo v0.7.1 // indirect
82+
github.com/moby/sys/userns v0.1.0 // indirect
8383
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8484
github.com/modern-go/reflect2 v1.0.2 // indirect
8585
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8686
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8787
github.com/opencontainers/go-digest v1.0.0 // indirect
88-
github.com/opencontainers/runc v1.1.13 // indirect
89-
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
88+
github.com/opencontainers/runc v1.2.0 // indirect
9089
github.com/opencontainers/selinux v1.11.0 // indirect
9190
github.com/pkg/errors v0.9.1 // indirect
9291
github.com/prometheus/client_golang v1.19.1 // indirect
9392
github.com/prometheus/client_model v0.6.1 // indirect
9493
github.com/prometheus/common v0.55.0 // indirect
9594
github.com/prometheus/procfs v0.15.1 // indirect
96-
github.com/sirupsen/logrus v1.9.3 // indirect
9795
github.com/spf13/cobra v1.8.1 // indirect
9896
github.com/spf13/pflag v1.0.5 // indirect
9997
github.com/stoewer/go-strcase v1.2.0 // indirect

tests/e2e-kubernetes/go.sum

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 h1:NKTa1eqZYw8tiHSRGpP0VtTdub/8
4848
github.com/aws/aws-sdk-go-v2/service/sts v1.30.7/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o=
4949
github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4=
5050
github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
51-
github.com/awslabs/aws-s3-csi-driver v1.14.0 h1:Zz6O2EC3PyPa3AvV2GNMA6r1CSzuemkgdvwPYI1PTjo=
52-
github.com/awslabs/aws-s3-csi-driver v1.14.0/go.mod h1:ZfoFJYuruaARmOVK37sqo9UtdppBsko7vO6HkoJpAoU=
5351
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
5452
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
5553
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -108,8 +106,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
108106
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
109107
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
110108
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
111-
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
112-
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
113109
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
114110
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
115111
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
@@ -177,6 +173,8 @@ github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8
177173
github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
178174
github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
179175
github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
176+
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
177+
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
180178
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
181179
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
182180
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -192,10 +190,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
192190
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
193191
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
194192
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
195-
github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs=
196-
github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA=
197-
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4=
198-
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
193+
github.com/opencontainers/runc v1.2.0 h1:qke7ZVCmJcKrJVY2iHJVC+0kql9uYdkusOPsQOOeBw4=
194+
github.com/opencontainers/runc v1.2.0/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc=
199195
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
200196
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
201197
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -337,7 +333,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
337333
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
338334
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
339335
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
340-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
341336
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
342337
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
343338
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=

0 commit comments

Comments
 (0)