From eb70f1854662080e2e54e5f878e0fb52e7c17813 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2026 19:10:52 +0000 Subject: [PATCH] build(deps): Bump github.com/opencontainers/runc from 1.4.3 to 1.5.1 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.4.3 to 1.5.1. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.5.1/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.4.3...v1.5.1) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-version: 1.5.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 3 +- go.sum | 10 +- vendor/github.com/moby/sys/devices/LICENSE | 202 ++++++++++++++++++ .../sys}/devices/device_unix.go | 45 ++-- vendor/github.com/moby/sys/devices/doc.go | 4 + .../utils => internal/cmsg}/cmsg.go | 7 +- .../libcontainer/devices/device_deprecated.go | 20 -- .../devices/device_deprecated_unix.go | 55 +++++ .../runc/libcontainer/exeseal/doc.go | 3 + .../runc/libcontainer/system/doc.go | 2 + .../libcontainer/utils/cmsg_deprecated.go | 35 +++ .../runc/libcontainer/utils/utils.go | 23 +- .../runc/libcontainer/utils/utils_unix.go | 40 ---- vendor/modules.txt | 8 +- 14 files changed, 354 insertions(+), 103 deletions(-) create mode 100644 vendor/github.com/moby/sys/devices/LICENSE rename vendor/github.com/{opencontainers/runc/libcontainer => moby/sys}/devices/device_unix.go (62%) create mode 100644 vendor/github.com/moby/sys/devices/doc.go rename vendor/github.com/opencontainers/runc/{libcontainer/utils => internal/cmsg}/cmsg.go (97%) delete mode 100644 vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated.go create mode 100644 vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated_unix.go create mode 100644 vendor/github.com/opencontainers/runc/libcontainer/exeseal/doc.go create mode 100644 vendor/github.com/opencontainers/runc/libcontainer/system/doc.go create mode 100644 vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg_deprecated.go diff --git a/go.mod b/go.mod index 052545ff8..0252d3d16 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/moby/sys/reexec v0.1.0 github.com/moby/sys/symlink v0.3.0 github.com/opencontainers/cgroups v0.0.7 - github.com/opencontainers/runc v1.4.3 + github.com/opencontainers/runc v1.5.1 github.com/opencontainers/runtime-spec v1.3.0 github.com/pelletier/go-toml v1.9.5 github.com/prometheus/procfs v0.21.1 @@ -37,6 +37,7 @@ require ( github.com/knqyf263/go-plugin v0.9.0 // indirect github.com/kr/text v0.2.0 // indirect github.com/moby/sys/capability v0.4.0 // indirect + github.com/moby/sys/devices v0.1.0 // indirect github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect diff --git a/go.sum b/go.sum index a67efdd9d..3c13d880d 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk= github.com/moby/sys/capability v0.4.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I= +github.com/moby/sys/devices v0.1.0 h1:uaMrDm1U3h0AwUDNWeT5lBV40v0eayt+VuukRbYn5K4= +github.com/moby/sys/devices v0.1.0/go.mod h1:nIV6AO7t0DY2ObAm1GfL4AX9mBRqzxzHwGfvNCR9lfI= github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/moby/sys/reexec v0.1.0 h1:RrBi8e0EBTLEgfruBOFcxtElzRGTEUkeIFaVXgU7wok= @@ -60,14 +62,14 @@ github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os= github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo= github.com/opencontainers/cgroups v0.0.7 h1:FqhggFhigAMgKKwy39jweWX3h7Ha6VBF/qNR6Sso3oc= github.com/opencontainers/cgroups v0.0.7/go.mod h1:hPBRvnBhLZueEN0eJyozMeM3HeFGYlZW9KnO//px6G4= -github.com/opencontainers/runc v1.4.3 h1:/bq84roxG30xEICkFodXzMEVQFs7kzo4lCiZME1uKxI= -github.com/opencontainers/runc v1.4.3/go.mod h1:ufk5PTTsy5pnGBAvTh50e+eqGk01pYH2YcVxh557Qlk= +github.com/opencontainers/runc v1.5.1 h1:zgJPvESRUNz2UhHTG436ZIewGbQoJDAO9HRyyarggfY= +github.com/opencontainers/runc v1.5.1/go.mod h1:95e1csYzphSxDuOF+BhCxklMFV0eehUWZwYId+70EZE= github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5diQ8ibYCRkxg= github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116 h1:tAKu3NkKWZYpqBSOJKwTxT1wIGueiF7gcmcNgr5pNTY= github.com/opencontainers/runtime-tools v0.9.1-0.20251114084447-edf4cb3d2116/go.mod h1:DKDEfzxvRkoQ6n9TGhxQgg2IM1lY4aM0eaQP4e3oElw= -github.com/opencontainers/selinux v1.13.0 h1:Zza88GWezyT7RLql12URvoxsbLfjFx988+LGaWfbL84= -github.com/opencontainers/selinux v1.13.0/go.mod h1:XxWTed+A/s5NNq4GmYScVy+9jzXhGBVEOAyucdRUY8s= +github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE= +github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/vendor/github.com/moby/sys/devices/LICENSE b/vendor/github.com/moby/sys/devices/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/vendor/github.com/moby/sys/devices/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/opencontainers/runc/libcontainer/devices/device_unix.go b/vendor/github.com/moby/sys/devices/device_unix.go similarity index 62% rename from vendor/github.com/opencontainers/runc/libcontainer/devices/device_unix.go rename to vendor/github.com/moby/sys/devices/device_unix.go index 409e58e96..bd401d3b7 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/devices/device_unix.go +++ b/vendor/github.com/moby/sys/devices/device_unix.go @@ -1,5 +1,25 @@ //go:build !windows +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2015-2026 Open Containers Initiative Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// This code originally comes from runc and was taken from this tree: +// . + package devices import ( @@ -7,6 +27,7 @@ import ( "os" "path/filepath" + "github.com/opencontainers/cgroups/devices/config" "golang.org/x/sys/unix" ) @@ -22,7 +43,7 @@ var ( // DeviceFromPath takes the path to a device and its cgroup_permissions (which // cannot be easily queried) to look up the information about a linux device // and returns that information as a Device struct. -func DeviceFromPath(path, permissions string) (*Device, error) { +func DeviceFromPath(path, permissions string) (*config.Device, error) { var stat unix.Stat_t err := unixLstat(path, &stat) if err != nil { @@ -30,7 +51,7 @@ func DeviceFromPath(path, permissions string) (*Device, error) { } var ( - devType Type + devType config.Type mode = stat.Mode devNumber = uint64(stat.Rdev) //nolint:unconvert // Rdev is uint32 on e.g. MIPS. major = unix.Major(devNumber) @@ -38,20 +59,20 @@ func DeviceFromPath(path, permissions string) (*Device, error) { ) switch mode & unix.S_IFMT { case unix.S_IFBLK: - devType = BlockDevice + devType = config.BlockDevice case unix.S_IFCHR: - devType = CharDevice + devType = config.CharDevice case unix.S_IFIFO: - devType = FifoDevice + devType = config.FifoDevice default: return nil, ErrNotADevice } - return &Device{ - Rule: Rule{ + return &config.Device{ + Rule: config.Rule{ Type: devType, Major: int64(major), Minor: int64(minor), - Permissions: Permissions(permissions), + Permissions: config.Permissions(permissions), }, Path: path, FileMode: os.FileMode(mode &^ unix.S_IFMT), @@ -61,18 +82,18 @@ func DeviceFromPath(path, permissions string) (*Device, error) { } // HostDevices returns all devices that can be found under /dev directory. -func HostDevices() ([]*Device, error) { +func HostDevices() ([]*config.Device, error) { return GetDevices("/dev") } // GetDevices recursively traverses a directory specified by path // and returns all devices found there. -func GetDevices(path string) ([]*Device, error) { +func GetDevices(path string) ([]*config.Device, error) { files, err := osReadDir(path) if err != nil { return nil, err } - var out []*Device + var out []*config.Device for _, f := range files { switch { case f.IsDir(): @@ -103,7 +124,7 @@ func GetDevices(path string) ([]*Device, error) { } return nil, err } - if device.Type == FifoDevice { + if device.Type == config.FifoDevice { continue } out = append(out, device) diff --git a/vendor/github.com/moby/sys/devices/doc.go b/vendor/github.com/moby/sys/devices/doc.go new file mode 100644 index 000000000..a590f4495 --- /dev/null +++ b/vendor/github.com/moby/sys/devices/doc.go @@ -0,0 +1,4 @@ +// Package devices provides some helper functions for constructing device +// configurations for runc. These are exclusively used by higher-level runtimes +// that need to configure runc's device list based on existing devices. +package devices diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.go b/vendor/github.com/opencontainers/runc/internal/cmsg/cmsg.go similarity index 97% rename from vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.go rename to vendor/github.com/opencontainers/runc/internal/cmsg/cmsg.go index 93bfbbd7f..b3a02fb25 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.go +++ b/vendor/github.com/opencontainers/runc/internal/cmsg/cmsg.go @@ -1,4 +1,6 @@ -package utils +// Package cmsg provides helpers for sending and receiving SCM_RIGHTS messages +// via sockets. +package cmsg /* * Copyright 2016, 2017 SUSE LLC @@ -21,8 +23,9 @@ import ( "os" "runtime" - "github.com/opencontainers/runc/internal/linux" "golang.org/x/sys/unix" + + "github.com/opencontainers/runc/internal/linux" ) // MaxNameLen is the maximum length of the name of a file descriptor being sent diff --git a/vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated.go b/vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated.go deleted file mode 100644 index 9483f054d..000000000 --- a/vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated.go +++ /dev/null @@ -1,20 +0,0 @@ -package devices - -import "github.com/opencontainers/cgroups/devices/config" - -// Deprecated: use [github.com/opencontainers/cgroups/devices/config]. -const ( - Wildcard = config.Wildcard - WildcardDevice = config.WildcardDevice - BlockDevice = config.BlockDevice - CharDevice = config.CharDevice - FifoDevice = config.FifoDevice -) - -// Deprecated: use [github.com/opencontainers/cgroups/devices/config]. -type ( - Device = config.Device - Permissions = config.Permissions - Type = config.Type - Rule = config.Rule -) diff --git a/vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated_unix.go new file mode 100644 index 000000000..f562b44c5 --- /dev/null +++ b/vendor/github.com/opencontainers/runc/libcontainer/devices/device_deprecated_unix.go @@ -0,0 +1,55 @@ +//go:build !windows + +// Package devices provides some helper functions for constructing device +// configurations for runc. These are exclusively used by higher-level runtimes +// that need to configure runc's device list based on existing devices. +// +// Deprecated: Use github.com/moby/sys/devices instead. This package will be +// removed in runc 1.6. +package devices + +import ( + "github.com/moby/sys/devices" + "github.com/opencontainers/cgroups/devices/config" +) + +// ErrNotADevice denotes that a file is not a valid linux device. +// +// Deprecated: Use [devices.ErrNotADevice] instead. This package will be +// removed in runc 1.6. +// +//go:fix inline +var ErrNotADevice = devices.ErrNotADevice + +// DeviceFromPath takes the path to a device and its cgroup_permissions (which +// cannot be easily queried) to look up the information about a linux device +// and returns that information as a Device struct. +// +// Deprecated: Use [devices.DeviceFromPath] instead. This package will be +// removed in runc 1.6. +// +//go:fix inline +func DeviceFromPath(path, permissions string) (*config.Device, error) { + return devices.DeviceFromPath(path, permissions) +} + +// HostDevices returns all devices that can be found under /dev directory. +// +// Deprecated: Use [devices.HostDevices] instead. This package will be +// removed in runc 1.6. +// +//go:fix inline +func HostDevices() ([]*config.Device, error) { + return devices.HostDevices() +} + +// GetDevices recursively traverses a directory specified by path +// and returns all devices found there. +// +// Deprecated: Use [devices.GetDevices] instead. This package will be +// removed in runc 1.6. +// +//go:fix inline +func GetDevices(path string) ([]*config.Device, error) { + return devices.GetDevices(path) +} diff --git a/vendor/github.com/opencontainers/runc/libcontainer/exeseal/doc.go b/vendor/github.com/opencontainers/runc/libcontainer/exeseal/doc.go new file mode 100644 index 000000000..56fe697a6 --- /dev/null +++ b/vendor/github.com/opencontainers/runc/libcontainer/exeseal/doc.go @@ -0,0 +1,3 @@ +// Package exeseal provides mechanisms for sealing /proc/self/exe and thus +// protecting the runc binary against CVE-2019-5736-style attacks. +package exeseal diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/doc.go b/vendor/github.com/opencontainers/runc/libcontainer/system/doc.go new file mode 100644 index 000000000..0326601f4 --- /dev/null +++ b/vendor/github.com/opencontainers/runc/libcontainer/system/doc.go @@ -0,0 +1,2 @@ +// Package system provides wrappers for Linux system operations. +package system diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg_deprecated.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg_deprecated.go new file mode 100644 index 000000000..1da908a2b --- /dev/null +++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg_deprecated.go @@ -0,0 +1,35 @@ +package utils + +import ( + "os" + + "github.com/opencontainers/runc/internal/cmsg" +) + +// RecvFile waits for a file descriptor to be sent over the given AF_UNIX +// socket. The file name of the remote file descriptor will be recreated +// locally (it is sent as non-auxiliary data in the same payload). +// +// Deprecated: This method is deprecated and has been moved to an internal +// package (see [cmsg.RecvFile]). It will be removed in runc 1.6. +func RecvFile(socket *os.File) (*os.File, error) { + return cmsg.RecvFile(socket) +} + +// SendFile sends a file over the given AF_UNIX socket. file.Name() is also +// included so that if the other end uses RecvFile, the file will have the same +// name information. +// +// Deprecated: This method is deprecated and has been moved to an internal +// package (see [cmsg.SendFile]). It will be removed in runc 1.6. +func SendFile(socket, file *os.File) error { + return cmsg.SendFile(socket, file) +} + +// SendRawFd sends a specific file descriptor over the given AF_UNIX socket. +// +// Deprecated: This method is deprecated and has been moved to an internal +// package (see [cmsg.SendRawFd]). It will be removed in runc 1.6. +func SendRawFd(socket *os.File, msg string, fd uintptr) error { + return cmsg.SendRawFd(socket, msg, fd) +} diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go index 6c3baf015..2685172dc 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils.go @@ -1,3 +1,4 @@ +// Package utils provides general helper utilities used in libcontainer. package utils import ( @@ -6,8 +7,6 @@ import ( "strings" "golang.org/x/sys/unix" - - "github.com/opencontainers/runc/internal/pathrs" ) const ( @@ -66,23 +65,3 @@ func Annotations(labels []string) (bundle string, userAnnotations map[string]str } return bundle, userAnnotations } - -// CleanPath makes a path safe for use with filepath.Join. This is done by not -// only cleaning the path, but also (if the path is relative) adding a leading -// '/' and cleaning it (then removing the leading '/'). This ensures that a -// path resulting from prepending another path will always resolve to lexically -// be a subdirectory of the prefixed path. This is all done lexically, so paths -// that include symlinks won't be safe as a result of using CleanPath. -// -// Deprecated: This function has been moved to internal/pathrs and this wrapper -// will be removed in runc 1.5. -var CleanPath = pathrs.LexicallyCleanPath - -// StripRoot returns the passed path, stripping the root path if it was -// (lexicially) inside it. Note that both passed paths will always be treated -// as absolute, and the returned path will also always be absolute. In -// addition, the paths are cleaned before stripping the root. -// -// Deprecated: This function has been moved to internal/pathrs and this wrapper -// will be removed in runc 1.5. -var StripRoot = pathrs.LexicallyStripRoot diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go index af5689e9a..91264f0d3 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go @@ -6,13 +6,11 @@ import ( "fmt" "math" "os" - "path/filepath" "runtime" "strconv" "sync" _ "unsafe" // for go:linkname - securejoin "github.com/cyphar/filepath-securejoin" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" @@ -146,44 +144,6 @@ func NewSockPair(name string) (parent, child *os.File, err error) { return os.NewFile(uintptr(fds[1]), name+"-p"), os.NewFile(uintptr(fds[0]), name+"-c"), nil } -// WithProcfd runs the passed closure with a procfd path (/proc/self/fd/...) -// corresponding to the unsafePath resolved within the root. Before passing the -// fd, this path is verified to have been inside the root -- so operating on it -// through the passed fdpath should be safe. Do not access this path through -// the original path strings, and do not attempt to use the pathname outside of -// the passed closure (the file handle will be freed once the closure returns). -// -// Deprecated: This function is an internal implementation detail of runc and -// is no longer used. It will be removed in runc 1.5. -func WithProcfd(root, unsafePath string, fn func(procfd string) error) error { - // Remove the root then forcefully resolve inside the root. - unsafePath = pathrs.LexicallyStripRoot(root, unsafePath) - fullPath, err := securejoin.SecureJoin(root, unsafePath) - if err != nil { - return fmt.Errorf("resolving path inside rootfs failed: %w", err) - } - - procSelfFd, closer := ProcThreadSelf("fd/") - defer closer() - - // Open the target path. - fh, err := os.OpenFile(fullPath, unix.O_PATH|unix.O_CLOEXEC, 0) - if err != nil { - return fmt.Errorf("open o_path procfd: %w", err) - } - defer fh.Close() - - procfd := filepath.Join(procSelfFd, strconv.Itoa(int(fh.Fd()))) - // Double-check the path is the one we expected. - if realpath, err := os.Readlink(procfd); err != nil { - return fmt.Errorf("procfd verification failed: %w", err) - } else if realpath != fullPath { - return fmt.Errorf("possibly malicious path detected -- refusing to operate on %s", realpath) - } - - return fn(procfd) -} - // WithProcfdFile is a very minimal wrapper around [ProcThreadSelfFd]. The // caller is responsible for making sure that the provided file handle is // actually safe to operate on. diff --git a/vendor/modules.txt b/vendor/modules.txt index 53ec0614d..20c25e63b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -71,6 +71,9 @@ github.com/knqyf263/go-plugin/wasm # github.com/moby/sys/capability v0.4.0 ## explicit; go 1.21 github.com/moby/sys/capability +# github.com/moby/sys/devices v0.1.0 +## explicit; go 1.24 +github.com/moby/sys/devices # github.com/moby/sys/mountinfo v0.7.2 ## explicit; go 1.17 github.com/moby/sys/mountinfo @@ -83,8 +86,9 @@ github.com/moby/sys/symlink # github.com/opencontainers/cgroups v0.0.7 ## explicit; go 1.24.0 github.com/opencontainers/cgroups/devices/config -# github.com/opencontainers/runc v1.4.3 -## explicit; go 1.24.0 +# github.com/opencontainers/runc v1.5.1 +## explicit; go 1.25.0 +github.com/opencontainers/runc/internal/cmsg github.com/opencontainers/runc/internal/linux github.com/opencontainers/runc/internal/pathrs github.com/opencontainers/runc/libcontainer/devices