summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-08-18 03:01:03 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-08-18 03:01:05 +0000
commitcc122f0f0a78ae2041b97c03fa5c11761d8ab27c (patch)
treefdd3dbcd4dfbb4c908c529553eab5b7972286f2f
parent68e4f545a653f111bd164ea7dcaebdc2aa1ce71f (diff)
downloadmeta-virtualization-cc122f0f0a78ae2041b97c03fa5c11761d8ab27c.tar.gz
runc: update to 1.0.0-rc92
Refresh patches for new context, drop CVE patch that has been integrated into the main repository. The following changes are part of this refresh: 49a73463 Merge pull request #2547 from kolyshkin/moar-v2-tests 9ada2e6d Merge pull request #2539 from kolyshkin/ext-pidns-nits b70de388 Merge pull request #2540 from kolyshkin/unify-test-inval-cgroup 0509b5ba Merge pull request #2553 from AkihiroSuda/support-kernel59-caps 6dfbe9b8 support CAP_PERFMON, CAP_BPF, and CAP_CHECKPOINT_RESTORE 54c53b10 Merge pull request #2533 from XiaodongLoong/fix_cgMode_redundant a2d1f85b Merge pull request #2542 from AkihiroSuda/go1.15 4c71a68c upgrade Go to 1.15 dedadbf9 Merge pull request #2545 from kolyshkin/go-mod-vendor 809dc640 Merge pull request #2548 from kolyshkin/int-cr-fix 7f64fb47 use criu cgroup mode const from go-criu 5026bfab tests/int: fix error handling and logging 2de0b5aa libct/integration: enable some tests for cgroupv2 985bd24f Makefile: fix go vet/fmt a340fa9b Merge pull request #2543 from mrunalp/release_1.0.0-rc92 1ff1bf34 VERSION: back to development ff819c7e VERSION: release 1.0.0-rc92 f6688549 Merge pull request #2499 from kolyshkin/find-cgroup-mountpoint-fastpath 234d15ec Merge pull request #2520 from thaJeztah/bump_runtime_spec 78d02e85 Merge pull request #2534 from adrianreber/go-criu-4-1-0 637d54b7 cgroups/fs tests: unify TestInvalid*Cgroup* e54d1e47 libct: initialize inheritFD in place 8b973997 libct: criuNsToKey doesn't have to be a method 3de3112c Merge pull request #2525 from adrianreber/external-pidns 6f4616dd Pass location of CRIU binary to go-criu 267b7148 Upgrade go-criu to 4.1.0 d6f5641c Merge pull request #2507 from kolyshkin/alt-to-2497 46243fce Merge pull request #2500 from kolyshkin/fs-apply e0c0b0cf libct/cgroups/GetCgroupRoot: make it faster 901dccf0 vendor: update runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6 97b02cf9 Merge pull request #2531 from JFHwang/gomod_update 59352963 Update go.mod 67169a9d merge branch 'pr-2529' 95a59bf2 devices: correctly check device types 09e103b0 Tell CRIU to use an external pid namespace if necessary 610c5ad7 Factor out checkpointing with external namespace code d65df61d Merge pull request #2521 from zvier/master 92e2175d cleancode: clean code for utils_linux.go 86d9399c Merge pull request #2524 from adrianreber/fix-travis b7683d6b Fix .travis.yml warnings f8749ba0 merge branch 'pr-2509' f9850afa Merge pull request #2518 from XiaodongLoong/redundant_chroot_param af283b3f remove redundant the parameter of chroot function b7d8f3bf Merge pull request #2516 from ide-rea/fix-typo 47fbafb7 Merge pull request #2510 from kolyshkin/criu-el7 76b05e6d fix small typo cf1273ab Merge pull request #2498 from kolyshkin/v1-code-cleanups 545ebdd1 Merge pull request #2511 from kolyshkin/fedora-dnf-fix fbf047bf Merge pull request #2501 from XiaodongLoong/systemderror-fix f57bb2fe fix TestPidsSystemd and TestRunWithKernelMemorySystemd test error ce54a9d4 Merge pull request #2514 from rhatdan/windows 6d5125f8 tests/int/checkpoint: don't remove readonly flag 9806eb55 Merge pull request #2513 from lsm5/custom-PREFIX-in-Makefile d78ee471 Allow libcontainer/configs to be imported on Windows 5517d1d7 Merge pull request #2505 from XiaodongLoong/redundant-copy-src ffe9f0b0 Vagrantfile.centos7: do not ignore script failures bc1a9c11 allow customizable PREFIX variable a73ce38d cgroupv1/FindCgroupMountpoint: add a fast path c27b8e7f tests/fedora32: retry dnf 92f49821 tests/centos7: add criu 98c7c01d tests/int/checkpoint: require cgroupns c1adc99a cgroup/fs: rework Apply() 417f5ff4 tests/int/checkpoint: fds and pids cleanup 819fcc68 merge branch 'pr-2495' 2a322e91 cgroupv1: remove subsystemSet.Get() daf30cb7 cgroups/fs: rm getSubsystems 2e225799 libct/cgroups/fs.GetStats: drop PathExists check 11fb9496 cgroups/fs: rm Remove method from controllers 30dc54a9 Merge pull request #2503 from giuseppe/cgroup-fixes 3f811318 Merge pull request #2490 from kolyshkin/dev-opt 32034481 cgroup, systemd: cleanup cgroups 46a304b5 Merge pull request #2502 from tjucoder/master e638eda0 Merge pull request #2496 from kolyshkin/freeze-nits a4cb88f3 redundant souce code copy There is a docker -v flag for test in Makefile 2deaeab0 cgroup: store the result of IsRunningSystemd ab35cfe2 make sure pty.Close() will be called and fix comment 62a30709 cgroups/fs/path: optimize 46b26bc0 cgroups/fs/Freeze: simplify cd479f9d cgroupv1/freezer: don't use subsystemSet.Get() 3cb1909c Merge pull request #2493 from thaJeztah/bump_ebpf 108ee85b libct/cgroups: add SkipDevices to Resources f49adb52 vendor: update cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775 6f5edda9 merge branch 'pr-2491' d0e92896 VERSION: back to development 24a3cf88 VERSION: release 1.0.0-rc91 1b94395c Merge pull request #2476 from kolyshkin/cpt-err-log 834c4573 Merge pull request #2482 from kinvolk/alban/integration-tests 327284eb integration tests: fix typo in README.md 0fa097fc merge branch 'pr-2481' dff7685c Merge pull request #2459 from tedyu/linux-cont-set-cfg e643db6e Merge pull request #2479 from haircommander/fix-systemd-version 04806abd nsenter: fix repeat close() operations 9748b487 Merge pull request #2229 from RenaudWasTaken/create-container 861afa75 Add integration tests for the new runc hooks 2f7bdf9d Tests the new Hook 6a0f64e7 systemd: add unit tests for systemdVersion 6369e388 systemd: parse systemdVersion in more situations 819c40b3 Merge pull request #2478 from kolyshkin/get-pids 89516d17 libct/cgroups/readProcsFile: ret errorr if scan failed 406298fd Merge pull request #2466 from kolyshkin/systemd-cpu-quota-period 12a7c8fc Merge pull request #2411 from kolyshkin/v1-specific ccdd7576 Add the CreateRuntime, CreateContainer and StartContainer Hooks e232a71a tests/int/checkpoint: fix checks, add logs a6ddabd6 tests/int/checkpoint: whitespace cleanups e751a168 cgroups/systemd: add setting CPUQuotaPeriod prop 8c5a19f7 libct/cgroups/fs: rename some files cec5ae7c libct/cgroupv1/getCgroupMountsHelper: minor nit 0626c150 libct/cgroupv1: fix TestGetCgroupMounts test cases 0681d456 libct/cgroups/utils: move cgroup v1 code to separate file 7db2d3e1 libcontainer/cgroups: rm FindCgroupMountpointDir d244b405 libct/cgroups: improve ParseCgroupFile docs 5785aabc libct/cgroups: make isSubsystemAvailable v1-specific d5c57dce libct/criuApplyCgroups: don't set cgroup paths for v2 52b56bc2 libc/criuSwrk: remove applyCgroups param 142d0f2d libct/cgroups/utils: make FindCgroupMountpoint* v1-specific 44b75e76 libct/cgroups: separate getCgroupMountsV1 82d2fa4e Merge pull request #2453 from AkihiroSuda/vagrant-centos7 3834222d libct/cgroups/utils: getControllerPath return err for v2 55c77cb9 Merge pull request #2472 from kolyshkin/paths-nits dd2426d0 libct/cgroups: fix m.paths map access a77d7b1d libct: don't use GetPaths 5b247e73 Merge pull request #2338 from lifubang/systemdcgroupv2 c76af1d2 Merge pull request #2470 from katarzyna-z/kk-fix-numa-stats 601fa557 Merge pull request #2414 from kolyshkin/criu-notif 71e63de4 Fix #2469 omit memory.numa_stat when not available fdc48376 Merge pull request #2458 from kolyshkin/cpu-quota-II 3ddb913a Merge pull request #2467 from mrunalp/save_state_atomic ed9d93e2 Merge pull request #2455 from AkihiroSuda/docs-cgroup2 a4a306d2 Write state.json atomically 499357d6 add Vagrantfile.centos7 262ef563 update.bats: support systemd <= 226 1f366c6a tests/rootless.sh: fix executing bats in non-root PATH 6246bb11 spec.bats: avoid using `git -C` bd236e50 integration: skip checkpoint tests if criu binary not found b2163040 Merge pull request #2454 from AkihiroSuda/ci-fix-rt 1b03e725 tests/int/update: more cpu period/quota cases a92b0327 cgroups/systemd: fix set CPU quota if period is unset 1832bf0b tests/int/update: add cpu-quota -1 tests 7c2b2349 tests/integration/update: enable cpu quota for v2 32746fb3 update: do not overwrite old cpu quota/period 4189cb65 cgroups: remove cgroup.Resources.CpuMax 8b964677 cgroups/systemd: unify adding CpuQuota 2ce20ed1 cgroups/systemd: simplify gen*ResourcesProperties 9d275d32 Set configs back when intelrdt configs cannot be set 4be54355 add integration test for ps/kill after the container stopped 1b97c04f merge branch 'pr-2445' 2a046695 merge branch 'pr-2446' 79fe41d3 Replace sed with jq for more readable json manipulation in tests 13865704 add cgroup v2 documentation 10d1e1ed test "update rt period and runtime": fix up runtime and period 0853956d Merge pull request #2452 from AkihiroSuda/silence-criu-not-found 13020202 Merge pull request #2449 from katarzyna-z/kk-fix-2440 9087f2e8 fix path error in systemd when stopped 4ad326a3 silence "which: no criu" 92f831bf Fix #2440 omit cpuacct.usage_all when not available d1ba8e39 (*initProcess).start: rm second Apply dbe5acad Merge pull request #2439 from kolyshkin/int-noswap 332a8458 Merge pull request #2443 from kolyshkin/kmem-fixup 0f7ffbeb Merge pull request #2416 from AkihiroSuda/exec-join-init-cgroup a30f2556 merge branch 'pr-2018' c91fe9ae cgroup2: exec: join the cgroup of the init process on EBUSY ed1f14af tests/int/events: skip oom test if no swap 755b1016 test/int/update: simplify mem+swap presence check 8d943633 test/int/update: simplify mem+swap checks e664e732 merge branch 'pr-2442' 2679754a Merge pull request #2441 from kolyshkin/check-cpushares 3fe6e045 cgroupv1/systemd.Set: don't enable kernel memory acct 3249e237 cgroupv1: check cpu shares in place 774a9e76 Merge pull request #2420 from tedyu/criu-proc-wait 3ba3d9b1 Wait for criuProcess once 0f3d6bec Remove pullapprove integration 64dbdb86 Merge pull request #2437 from kolyshkin/remove-faster a78e21b5 tests/int/delete.bats: fixups 0ac92aab cgroups/fs2: make removeCgroupPath faster 4f0bdafc Merge pull request #2412 from lifubang/removecgpath a891fee8 Merge pull request #2434 from kolyshkin/cpu-quota-fix-minimal be546787 cgroupv1: minimal fix for cpu quota regression 82fa1941 remove cgroup path recursively in cgroup v2 1f737eeb Merge pull request #2426 from kolyshkin/mem-swap-unlim 7673bee6 Merge pull request #2395 from lifubang/updateCgroupv2 68391c0e use lazy-pages ready notification for criu >= 3.15 7ab13298 libct/criuNotifications: simplify switch 3c6e8ac4 cgroupv2: set mem+swap to max if mem set to max 27515719 add testcase for enable all supported controllers in cgroupv2 a67dab0a Revert "CreateCgroupPath: only enable needed controllers" 3c8da9da Merge pull request #2422 from kolyshkin/criu-j d57f5bb2 cgroupv1: don't ignore MemorySwap if Memory==-1 21cb2360 merge branch 'pr-2427' 6a6ba0c0 Merge pull request #2423 from kolyshkin/systemd-v2-pids-max 8cd84e35 Merge pull request #2333 from opencontainers/add-cii-badge 59897367 cgroups/systemd: allow to set -1 as pids.limit 95413ecd tests/int/update: add cgroupv1 systemd CPU checks 06d7c1d2 systemd+cgroupv1: fix updating CPUQuotaPerSecUSec 7abd93d1 tests/integration/update.bats: more systemd checks e4a84bea cgroupv2+systemd: set MemoryLow 4fc9fa05 tests/int: simplify check_systemd_value use 716079f9 Merge pull request #2406 from cyphar/devices-cgroup-header 5b601c66 README.md: fix a dead link cd4b71c2 Merge pull request #2409 from adrianreber/go-criu-4-0-0 28cd9d9c Merge pull request #2419 from tianon/buildmode-arch-toggle 9a808dd0 Merge pull request #2424 from giuseppe/errno-ret 944e0570 Update to latest go-criu (4.0.2) 41aa1966 libcontainer: honor seccomp errnoRet 510c79f9 vendor: update runtime-specs to 237cc4f519e 236ec045 Dockerfile: speed up criu build be66519c Remove "-buildmode=pie" from platforms that don't support it b207d578 Merge pull request #2418 from AkihiroSuda/fix-bad-rebase-2413 2fa3c286 fix "libcontainer/cgroups/fs/cpuset.go:63:14: undefined: fmt" f369199f Merge pull request #2413 from JFHwang/2392-spec-check 53a46497 Merge pull request #2401 from kolyshkin/fs-cpuset-mountinfo 825e91ad Merge pull request #2341 from kolyshkin/test-cpt-lazy 67fac528 Merge pull request #2410 from lifubang/swap0patch 5aa0601a validateProcessSpec: prevent SEGV when config is valid json, but invalid. 7fc291fd Replace formatted errors when unneeded 9ad1beb4 never write empty string to memory.swap.max dc9a7879 cgroups: add copyright header to devices.Emulator implementation 3f1e8869 Merge pull request #2391 from cyphar/devices-cgroup 2db3240f libct/cgroups: rm GetClosestMountpointAncestor f1603526 libct/cgroup: prep to rm GetClosestMountpointAncestor 85d4264d Merge pull request #2390 from lifubang/threadedordomain 4b71877f Merge pull request #2292 from Creatone/creatone/extend-intelrdt 41855317 Merge pull request #2271 from katarzyna-z/kk-cpuacct-usage-all fe0669b2 don't enable threaded mode by default ba6eb282 tests: add integration test for paused-and-updated containers 4438eaa5 tests: add integration test for devices transition rules b810da14 cgroups: systemd: make use of Device*= properties afe83489 cgroupv1: devices: use minimal transition rules with devices.Emulator 2353ffec cgroups: implement a devices cgroupv1 emulator 24388be7 configs: use different types for .Devices and .Resources.Devices 60e21ec2 specconv: remove default /dev/console access b2bec980 cgroup: devices: eradicate the Allow/Deny lists 859a780d cgroups: add GetFreezerState() helper to Manager a79fa7ca contrib: recvtty: add --no-stdin flag df3d7f67 Merge pull request #2393 from kolyshkin/criu-pi 58bf0835 Merge pull request #2400 from kolyshkin/bats-1.2.0 17aee8c4 Dockerfile: bump bats to 1.2.0 2b9a36ee Merge pull request #2398 from pkagrawal/master 867c9f5b Merge pull request #2386 from kolyshkin/gordian-knot ca1d135b runc checkpoint: fix --status-fd to accept fd 4aa91014 Honor spec.Process.NoNewPrivileges in specconv.CreateLibcontainerConfig f0daf651 Vagrantfile: use criu from stable repo 714c91e9 Simplify cgroup path handing in v2 via unified API 2c8d668e Merge pull request #2387 from kolyshkin/g-knot-prepare 1d143562 libct/cgroups/fs: access m.paths under lock 51e1a084 libct/cgroups/systemd/v1: privatize v1 manager d827e323 libct/cgroups/systemd/v1: add NewLegacyManager fc620fdf libct/cgroups/fs: privatize Manager and its fields 5935bf8c libct/cgroups/fs: introduce NewManager() 24f945e0 libct/cgroups/systemd/v2: return a public interface 63854b0e newSetnsProcess: reuse state.CgroupPaths 9a3e6326 notify: simplify usage 6621af89 merge branch 'pr-2381' 828e4ad8 epbf: update github.com/cilium/ebpf b18a9650 test: update devicefilter tests 128cb60f ebpf: fix big endian issue for s390x 2b31437c Merge pull request #2281 from AkihiroSuda/rootless-systemd 47a73431 Merge pull request #2373 from kolyshkin/logging-nits 492cfd8b Merge pull request #2352 from lifubang/eventsv2 bf15cc99 cgroup v2: support rootless systemd 657407ff fix runc events error in cgroup v2 64416d34 Merge pull request #2382 from thaJeztah/bump_selinux b48bbdd0 vendor: opencontainers/selinux v1.5.1, update deprecated uses 407e9f9d Add reading of information from cpuacct.usage_all a57358e0 Merge pull request #2370 from lifubang/swap0 96310f04 Merge pull request #2377 from thaJeztah/ticks_simplify 402d645c Simplify ticks, as the value is a constant a0ddd02b Merge pull request #2378 from thaJeztah/bump_logrus 12ba2a73 Merge pull request #2380 from thaJeztah/userns_sync_once 9df0b5e2 libcontainer: RunningInUserNS() use sync.Once e8bece65 vendor: sirupsen/logrus v1.6.0 609ba79f Merge pull request #2371 from kolyshkin/criu314 6161d255 Merge pull request #2375 from tedyu/wait-lazy-close a70f3546 let runc disable swap in cgroup v2 db29dce0 Close fd in case fd.Write() returns error f6439a84 Merge pull request #2372 from thaJeztah/improve_error_readability 1b84a21c Don't print errors twice 64ca5481 libcontainer: simplify error message 2adfd20a libcontainer: don't double-quote errors c52a598d Remove fatalf() d2061ee5 Vagrantfile: install less packages e9e31f70 Vagrantfile: use criu 3.14 from testing 9634a80c Dockerfile: bump criu to version π (3.14) dd8d48ed Merge pull request #2358 from kolyshkin/fs2-nit c3b0b13f cgroups/fs2: don't always parse /proc/self/cgroup 051d6705 Merge pull request #2363 from AkihiroSuda/vagrant-f32 85c44b19 Vagrantfile: use Fedora 32 c18485ad Merge pull request #2359 from cyphar/terminal-docs-subreaper 0a4dcc02 Merge pull request #2331 from lifubang/StartTransientUnit eea0fbfe docs: terminals: mention subreaper requirement bfa1b2aa check that StartTransientUnit and StopUnit succeeds 80e2d1f1 Merge pull request #2357 from kolyshkin/makefile-2 a1f007e0 Merge pull request #2340 from AkihiroSuda/fix-2339 772d0909 Makefile: rm RELEASE_DIR and SHELL 731947d5 Makefile: fix/clean install-man df72e898 Makefile: rm uninstall* targets a036e890 Makefile: add -mod=vendor to go test 2fe9e31a Makefile: don't use -mod=vendor if GO111MODULE=off 19ba7688 Makefile: test, localtest: no need to invoke make fc54f6d7 Makefile: rm $(SOURCES), mark targets as PHONY b7dadf0f Makefile: rm $(allpackages) 60c647e3 fs2: fix cgroup.subtree_control EPERM on rootless + add CI 53fb4a5e Merge pull request #2342 from kolyshkin/vagrant-rm-ct 799d9481 intelrdt: Add Cache Monitoring Technology stats b19f9cec Merge pull request #2343 from lifubang/updateSystemdScope 0fd8d468 Merge pull request #2318 from lifubang/linuxResources baa20026 Merge pull request #2327 from kolyshkin/cpt-err 084144a6 travis: run vagrant tests on the host 634e51b5 Merge pull request #2335 from kolyshkin/cgroupv2-cpt 10ba72a6 add integration test for runc update with systemd 49ca1fd0 Merge pull request #2347 from kolyshkin/v2-allow-all-devs 78ff2797 Merge pull request #2334 from kolyshkin/makefile c420a3ec Merge pull request #2324 from kolyshkin/criu-freezer 5b4bff96 Merge pull request #2336 from kolyshkin/bats-core-2 44024426 Merge pull request #2330 from KentaTada/use-linuxnamespace-const fbeed522 Makefile: add -mod=vendor 1fe709a0 Makefile: use $(FOO) not ${FOO} d09a6ea9 Makefile: split long lines 64ec3557 Makefile: abstract go build flags 55d5c99c libct/mountToRootfs: rm useless code 20959b16 libcontainer/integration/checkpoint_test: simplify 1d4ccc8e fix data inconsistent when runc update in systemd driven cgroup v1 7682a2b2 fix data inconsistent when runc update in systemd driven cgroup v2 dbe44cbb merge branch 'pr-2348' fb99bbc7 merge branch 'pr-2326' 44747953 libcontainer: use x/sys/unix instead of the hardcoded value d4bc7c10 Dockerfile: use bats-core 32d52a0f tests/checkpoint: enable for Fedora 31 / cgroup v2 9280e356 checkpoint/restore: fix cgroupv2 handling 00a2844a tests/checkpoint: add simple c/r test for cgroupns 75a92ea6 cgroupv2: allow to set EnableAllDevices=true cdce577d Merge pull request #2332 from kolyshkin/cgroupv2-cr 7376bdc1 Fix reference to badge d5e68ceb tests/checkpoint.bats: fix test hang/failure bf172ef4 tests/checkpoint.bats: consolidate requires checks e216457e tests/checkpoint.bats: simplify status checks 69d599dd tests/checkpoint.bats: fix $? checks 46be7b61 Merge pull request #2299 from kolyshkin/fs2-init-ctrl 5c2a9782 Add CII Badge to README 5b38ef71 Merge pull request #2320 from kolyshkin/vgr ab276b1c cgroups/fs2/Destroy: use Remove, ignore ENOENT 992d5cad travis: enable fs2 driver test on fedora 4b4bc995 CreateCgroupPath: only enable needed controllers bb47e358 cgroup/systemd: reorganize de113415 cgroups/fs2/CreateCgroupPath: nit b5c1949f cgroups/fs2/CreateCgroupPath: reinstate check 813cb3eb cgroupv2: fix fs2 cgroup init 60eaed2e cgroupv2: move sanity path check to common code dbeff894 cgroupv2/systemd: privatize UnifiedManager 88c13c07 cgroupv2: use SecureJoin in systemd driver 9c80cd67 cgroupv2: rm legacy Paths from systemd driver b6cc3975 travis: rm BUILDTAGS 5f0424c9 Vagrantfile: rm disabling weak deps cd5f4fd9 Merge pull request #2325 from kolyshkin/nits-2 3006db2b checkpoint: don't print error if --pre-dump is set 3de86133 libcontainer: use consts of Namespace from runtime-spec 480bca91 cgroups/fs2: move type decl to beginning 353e9177 cgroups/fs2: do not use securejoin 9ae21e8d MAINTAINERS: add Kir Kolyshkin 58f970a0 cgroups/fscommon: use errors.Is af6b9e7f nit: do not use syscall package b3a481eb libcontainer: fix Checkpoint wrt cgroupv2 bf0a8e17 Merge pull request #2322 from lifubang/forceCgroupNS d0f9b9ce default join cgroup namespace in runc example e4981c91 merge branch 'pr-2317' d2a9c5da using default allowed devices when linux resources is null 7a978e35 Defer netns.Close() after error check 9f6a2d4d Merge pull request #2305 from kolyshkin/fs2-fix-default 191def70 Merge pull request #2308 from kolyshkin/exec-no-tty d1e4c7b8 intelrdt: add mbm stats 56aca5aa Merge pull request #2295 from kolyshkin/integration-cgroups 5c6216b1 Merge pull request #2278 from iwankgb/memory.numa_stats 84583eb1 Enable integration tests in cgroupv2 env 0965c970 tests/integration: disable swap tests for v2 483f9a0c tests/integration: add some cgroup v2 tests 3dfa5434 tests/integration/update.bats: simplify file creation b8b46419 tests/integration: rm kmem from upgrade tests ba3ee7fe tests/integration/update.bats: rm obsoleted comment 3f6a31b7 tests/integration: simplify cgroup paths init 3ae93580 tests/integration: check_cgroup_value: simplify 13431e0e Merge pull request #2312 from tedyu/cgrp-path-rollback 614bb966 cgroupv2/systemd: Properly remove intermediate directory 939bed2a runc exec: don't enable terminal unless -t is set ccbb3364 Merge pull request #2304 from AkihiroSuda/travis-do-not-ignore-cgroup2-failures d65ba5fa Merge pull request #2303 from KentaTada/remove-unneeded-syscall-import ea36045f cgroupv2: fix fs2 driver default path 16d21e2d travis: move `cgroup-v2` out of `allow_failures` e58a406b libcontainer: remove unneeded import 7fa13b27 intelrdt: change parseCpuInfoFile to return struct 9a93b737 Merge pull request #2288 from kolyshkin/mem-swap 7fe0a98e Exposing memory.numa_stats 5c15da9e Merge pull request #2300 from kolyshkin/fix-max 568cd62f cgroupv2: only treat -1 as "max" c86be8a2 cgroupv2: fix setting MemorySwap d3fdacb9 Merge pull request #2296 from KentaTada/update-readme-for-go1.13 a4bbc39d Merge pull request #2297 from giuseppe/cgroups-use-newstats 8b7ac5f4 libcontainer: use cgroups.NewStats d5e91b1c Merge pull request #2289 from AkihiroSuda/fix-TestGetContainerStateAfterUpdate 0c7a9c02 Merge pull request #2294 from tklauser/unused-consts 6cda0eac Merge pull request #2293 from tedyu/restore-svr-close f8f03700 README.md: update Go version to build 21d7bb95 Close criuServer so that even if CRIU crashes or unexpectedly exits, runc will not hang 3e678c08 Remove unused consts testScopeWait and testSliceWait e4363b03 Merge pull request #2291 from kolyshkin/errors-unwrap-v2 ec8c6950 Merge pull request #2235 from Zyqsempai/add-hugetlb-controller-to-cgroupv2 b2272b2c libcontainer: use errors.Is() and errors.As() c39f87a4 Revert "Merge pull request #2280 from kolyshkin/errors-unwrap" 4540b596 Fix TestGetContainerStateAfterUpdate on cgroup v2 0c6659ac Merge pull request #2261 from AkihiroSuda/vagrant-kvm f8e13885 Merge pull request #2280 from kolyshkin/errors-unwrap 6ca9d8e6 Merge pull request #2283 from tedyu/runc-path-in-prefix b26e4f27 Merge pull request #2284 from tedyu/criu-svr-close e3e26caf Merge pull request #2276 from kolyshkin/criu-v2 22a2c9a4 Merge pull request #2282 from kolyshkin/cgroupv2-getpaths 49896ab0 Avoid double close of criuServer d02fc484 isPathInPrefixList return value should be reverted 8d7977ee libct/isPaused: don't use GetPaths from v2 code 12e156f0 libct.isPaused: use errors.Unwrap 272c83e1 libct/cgroups: use errors.Unwrap bd737f1e libct/cgroups/fs: use errors.Unwrap d2dfc635 libct/cgroups/fs2: use errors.Unwrap e4e35b8d libct/cgroups/fscommon.WriteFile: use errors.Unwrap 66778b3c libct/setKernelMemory: use errors.Unwrap b8eed86e vagrant: switch from VirtualBox to KVM + increase HW resources fc840f19 cgroupv2: don't use GetCgroupMounts for criu c/r 9ec5b03e Merge pull request #2259 from adrianreber/v2-test 8221d999 Merge pull request #2279 from masters-of-cats/freezer 92a3f80e Merge pull request #2203 from mrunalp/systemd_conn_cleanup 2abc6a36 Actually check for syscall.ENODEV when checking if a container is paused 3e99aa36 Fix checkpoint/restore tests on Fedora 31 9a0184b1 cgroup2: use CRIU's new freezer v2 support d05e5728 systemd: Lazy initialize the systemd dbus connection 33c6125d systemd: Export IsSystemdRunning() function 4a9e1747 Merge pull request #2234 from thaJeztah/debian_buster dca34a04 Dockerfile: switch to "buster" variant (current stable) 48bf88c4 Dockerfile: prevent busting build-cache for busybox rootfs a5963876 Dockerfile: sort dependencies, and cleanup apt cache c4821c2b Dockerfile: set DEBIAN_FRONTEND=noninteractive 201152a9 Dockerfile: use build-args to allow overriding versions 8df45c89 Merge pull request #2268 from AkihiroSuda/vendor-20200325 ad6d577a travis: run `make verify-dependencies` with Go 1.14.x dfc1b0cd update vendor f1eea905 Merge pull request #2275 from kolyshkin/scan-nits 53ad1d51 Merge pull request #2256 from kolyshkin/mountinfo-alt 75ff40cd Merge pull request #2273 from kolyshkin/v2-untangle aab2c8ba libcontainer/intelrdt: optimize parseCpuInfoFile 0af5cd20 Nit: fix use of bufio.Scanner.Err d4a6a1d9 Merge pull request #2258 from masters-of-cats/eintr-retry b45db5d3 libcontainer/cgroup: obsolete Get*Cgroup for v2 a949e4f2 cgroupv2: UnifiedManager.Apply: simplify 5406833a cgroupv2/systemd: add getv2Path cebef0ee Merge pull request #2272 from kolyshkin/cgroupv2-max ec1f957b cgroupv2: don't use getSubsystemPath in Apply 6905b721 cgroupv2: use "max" for negative values 96596cbb Merge pull request #2270 from kolyshkin/systemd-no-kmem a675b5eb cgroupv2: don't try to set kmem for systemd case be51398a Merge pull request #2193 from milkwine/fix-readSync a7ee31fa Merge pull request #2260 from adrianreber/leave-running 7de5db3d Merge pull request #2263 from kolyshkin/nits cc183ca6 Merge pull request #2242 from AkihiroSuda/vendor-systemd 4e6d8a0f Merge pull request #2267 from tedyu/runner-destroy 3087d43b Merge pull request #1826 from jingxiaolu/fix_specconv_process_nil 07bd2809 Merge pull request #2257 from kolyshkin/no-signal 0a7762c6 Avoid duplicate calls to runner#destroy 1797622f Merge pull request #2264 from kolyshkin/dockerfile dd7b3461 libct/msMoveRoot: benefit from GetMounts filter fc4357a8 libct/msMoveRoot: rm redundant filepath.Abs() calls dce0de89 getParentMount: benefit from GetMounts filter 81d8452e libct/TestFactoryNewTmpfs: benefit from GetMounts c7ab2c03 libcontainer: switch to moby/sys/mountinfo package 3147c320 Switch to golang 1.13, drop unsupported versions 88a02447 Dockerfile: add -f to curl a572216f libcontainer/intelrdt: rm fmt.Sprintf 5542a2c7 libcontainer/cgroups: GetAllPids: optimize 12dc475d libcontainer: simplify createCgroupsv2Path 648295be Skip test for cgroups v2 f34eb2c0 Retry writing to cgroup files on EINTR error 87712d28 checkpoint: remove error message with --leave-running 34d47176 fix readSync 0e062a78 Remove signalmap, use unix.SignalNum 939cd0b7 Merge pull request #1737 from wking/remove-procConsole-comment 88474967 Merge pull request #1974 from openSUSE/unreachable-code 525b9f31 Merge pull request #2248 from AkihiroSuda/fix-cgroupv2-conversion 492d525e vendor: update go-systemd and godbus 981dbef5 Merge pull request #2226 from avagin/runsc-restore-cmd-wait a15d2c3c merge branch 'pr-2073' 9167393c merge branch 'pr-2254' 89c108b1 Makefile: add selinux and apparmor build tags 69f6f32f README, travis.yml: rm ambient tag 8615da6f Merge pull request #1999 from lifubang/rootlesspath 167e33ca Merge pull request #1807 from giuseppe/notify-no-block 25fd4a67 sd-notify: do not hang when NOTIFY_SOCKET is used with create aa269315 cgroup2: add CpuMax conversion 64e9a979 cgroup2: fix conversion b477a159 Remove unreachable code paths 7d6e091f fix error when there is --root and XDG_RUNTIME_DIR env 0ff53526 Merge pull request #2252 from pkagrawal/2251-fix 71dfb559 Merge pull request #2238 from tedyu/init-proc-err-ret 89a87adb Changed hugetlb pagesizes info source d804611d Added failcnt stats 62cfad97 specconv: add a test case to check null spec.Process 5b2b138d Synchronize the call to linuxContainer.Signal() 957da1f9 Use named error return for initProcess#start bbaba4c0 Merge pull request #2228 from cpuguy83/no_whiches 2864bf46 Merge pull request #1877 from KentaTada/add-rootless-testpath-in-makefile 777f97d8 Run verify-dependencies only on go1.x 83f9b889 Don't add git utils to go.mod in CI f7edcc3a Remove refrences to vndr a08ab87f Make CI script to verify that vendor is in sync df583b4c Fix file permissions for mounts.bats 38273546 Update spec test to use go.mod 69e8fb2a Add support for GO Modules fc5759cf Merge pull request #2222 from cyphar/update-travis af3a81e4 Add rootless testpath in Makefile 6503438f Merge pull request #2212 from Zyqsempai/2211-convert-blkio-weight-properly c4730fa6 Merge pull request #2230 from thaJeztah/update_selinux_v1.3.1 42bfdf5f Use "command -v" shell builtin instead of "which" 93e5c4d3 merge branch 'pr-2232' b6657fc3 Merge pull request #2231 from thaJeztah/nominate_akihiro d8953334 vendor: update opencontainers/selinux v1.3.3 22e00ddc vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf c295a633 vendor: update opencontainers/selinux v1.3.1 3b7e32fe Merge pull request #2210 from Zyqsempai/2164-remove-deprecated-systemd-resources 7f37afa8 Added HugeTlb controller for cgroupv2 98de8426 libcontainer: dual-license nsenter/cloned_binary.c bc43c4bd MAINTAINERS: add Akihiro Suda to maintainers 688cf6d4 merge branch 'pr-2223' 0f32b03d merge branch 'pr-2192' 13b1603f Merge pull request #2224 from kolyshkin/systemd-props 4b8134f6 Convert blkioWeight to io.weight properly 1cd71dfd systemd properties: support for *Sec values 2a81236e Document using annotations to set systemd props 4c5c3fb9 Support for setting systemd properties via annotations 81ef5024 Merge pull request #2213 from Zyqsempai/2166-convert-cpu-weight-poperly 7c439cc6 Added conversion for cpu.weight v2 269ea385 restore: fix a race condition in process.Wait() f27c4e15 Fix the value corresponding to rlimitmap [key] dc7d0bfa travis: update configuration 3b992087 Fix skip message for cgroupv2 e6555cc0 merge branch 'pr-2184' e0385902 README.md: modify the explanation of make flags ff107ee0 merge branch 'pr-2190' 7d23d1e1 Update README.md 0061cad8 Adding .pdf of audit 2b5730a5 Merge pull request #2221 from inductor/feature/fix_path_security e4c4935a Merge pull request #2217 from cyphar/release-rc10 ed4a3e9b Apply review c8ba9853 Fix path for security report line e4de2b25 VERSION: back to development dc9208a3 VERSION: update to 1.0.0~rc10 2fc03cc1 Merge pull request #2207 from cyphar/fix-double-volume-attack 3291d66b rootfs: do not permit /proc mounts to non-directories f6fb7a03 merge branch 'pr-2133' 5b96f314 Exchanged deprecated systemd resources with the appropriate for cgroupv2 cf9b7c33 Fix MAJ:MIN io.stat parsing order 709377ca Merge pull request #2198 from AkihiroSuda/criu-master 55f8c254 temporarily disable CRIU tests 5c20ea14 fix merging #2177 and #2169 5cc0deaf Merge pull request #2169 from AkihiroSuda/split-fs 2b52db75 Merge pull request #2177 from devimc/topic/libcontainer/kata-containers a88592a6 Merge pull request #2185 from liggitt/exec-race 8541d9cf Fix race checking for process exit and waiting for exec fifo 52951a7c Fix race in tty integration test with slow startup 8ddd8920 libcontainer: add method to get cgroup config from cgroup Manager cd7c59d0 libcontainer: export createCgroupConfig 7496a968 merge branch 'pr-2086' 201b0637 merge branch 'pr-2141' e1b5af06 Merge pull request #2161 from AkihiroSuda/makefile-overrride-docker ec49f98d fs2: support legacy device spec (to pass CI) 88e8350d cgroup2: split fs2 from fs 5e636953 merge branch 'pr-2174' 8bb10af4 Merge pull request #2165 from AkihiroSuda/travis-f31 41a20b58 Expose network interfaces via runc events 48b055c4 Makefile: allow overriding `docker` command c35c2c9c merge branch 'pr-2172' 42690e68 Make event types public 2186cfa3 Merge pull request #2168 from AkihiroSuda/ebpf-fix-rlimit faf1e44e cgroup2: ebpf: increase RLIM_MEMLOCK to avoid BPF_PROG_LOAD error 46def4cc Merge pull request #2154 from jpeach/2008-remove-static-build-tag b133feae Merge pull request #2145 from AkihiroSuda/ebpf ccd4436f .travis.yml: add Fedora 31 vagrant box (for cgroup2) faf673ee cgroup2: port over eBPF device controller from crun e57a7740 Merge pull request #2149 from AkihiroSuda/cgroup2-ps d239ca84 Merge pull request #2148 from AkihiroSuda/cg2-ignore-cpuset-when-no-config 03cf145f Merge pull request #2159 from AkihiroSuda/cgroup2-mount-in-userns f04fb998 Merge pull request #2160 from AkihiroSuda/cgroup2-no-proc-cgroups 74a3fe5d cgroup2: do not parse /proc/cgroups 9c81440f cgroup2: allow mounting /sys/fs/cgroup in UserNS without unsharing CgroupNS 13919f5d Remove the static_build build tag. c4d8e168 Merge pull request #2140 from crosbymichael/fs-unified 792af40d Merge pull request #1929 from kkallday/patch-1 8790f243 Merge pull request #2147 from AkihiroSuda/iov2-remove-v1-code 2cd9ba23 Merge pull request #2146 from AkihiroSuda/doc-not-prod-ready dbd771e4 cgroup2: implement `runc ps` 9996cf7d README.md: clarify cgroup2 support is not ready for production d918e7f4 cpuset_v2: skip Apply when no limit is specified 033936ef io_v2.go: remove blkio v1 code a610a848 criu: Ensure other users cannot read c/r files 4e370170 Merge pull request #2139 from rst0git/desc-permisions b28f58f3 Set unified mountpoint in find mnt func f017e0f9 checkpoint: Set descriptors.json file mode to 0600 c1485a1e merge branch 'pr-2134' 1b8a1eee merge branch 'pr-2132' ba16a38b Merge pull request #2135 from mrueg/security 4be50fe3 SECURITY: Add Security Policy 2111613c VERSION: back to development d736ef14 VERSION: update to 1.0.0-rc9 cad42f6e Merge pull request #2130 from cyphar/apparmor-verify-procfs d463f648 *: verify that operations on /proc/... are on procfs 9aef5044 vendor: update github.com/opencontainers/selinux 28e58a0f Support different field counts of cpuaact.stats e63b797f Handle ENODEV when accessing the freezer.state file 84373aaa Add SCMP_ACT_LOG as a valid Seccomp action (#1951) 3e425f80 Merge pull request #2129 from crosbymichael/proc-mount 331692ba Only allow proc mount if it is procfs 7507c64f Merge pull request #2041 from jburianek/notify-socket-permissions bf27c2f8 Merge pull request #2126 from flynn/fix-nsenter-unsupported af7b6547 libcontainer/nsenter: Don't import C in non-cgo file 6c055520 Merge pull request #2125 from giuseppe/mount-cgroups 267490e3 Merge pull request #2010 from lifubang/checkpointrootless e7a87dd2 Merge pull request #2098 from adrianreber/master 718a566e cgroup: support mount of cgroup2 a6606a7a Merge pull request #2029 from thaJeztah/bump_dependencies 115d4b9e bump golang/protobuf v1.0.0 85c02f3f bump coreos/go-systemd v19, godbus/dbus v5.0.1 21498b8e bump mrunalp/fileutils 7d4729fb36185a7c1719923406c9d40e54fb93c7 eb86f603 bump syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2 1150ce9c bump urfave/cli v1.20.0 8e4f645f bump docker/go-units v0.3.3 0fc06623 bump cyphar/filepath-securejoin v0.2.2 414a39de bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f de24d733 bump github.com/pkg/errors 0.8.1 4be3c48e Reformat vendor.conf and pin all deps by git-sha 0fd4342a Merge pull request #2028 from thaJeztah/bump_golang_versions 92ac8e3f Merge pull request #2113 from giuseppe/cgroupv2 524cb7c3 libcontainer: add systemd.UnifiedManager ec111368 libcontainer, cgroups: rename systemd.Manager to LegacyManager 1932917b libcontainer: add initial support for cgroups v2 92d851e0 Merge pull request #2123 from carlosedp/riscv64 4316e4d0 Bump x/sys and update syscall to start Risc-V support 51f2a861 Merge pull request #2122 from AkihiroSuda/cleanup 0bc069d7 nsenter: fix clang-tidy warning b225ef58 nsenter: minor clean up dd075602 Merge pull request #2120 from rhatdan/master e4aa7342 Rename cgroups_windows.go to cgroups_unsupported.go c61c7370 Merge pull request #2103 from sipsma/cgnil 68d73f0a Merge pull request #2107 from sashayakovtseva/public-get-devices f061842f Merge pull request #2119 from KentaTada/fix-proc-settings c740965a libcontainer: update masked paths of /proc 3525edde Merge pull request #2117 from filbranden/detection1 f7b65885 Merge pull request #2116 from filbranden/running1 518c8558 Remove libcontainer detection for systemd features 4ca00773 Update vendored dependencies to remove go-systemd/util 588f040a Avoid the dependency on cgo through go-systemd/util package afc24792 Make get devices function public 9c822e48 cgroups/fs: check nil pointers in cgroup manager 1712af0e man: fix man-pages 2e943784 Merge pull request #2094 from sipsma/2093-nodotudev 44f9ec13 Merge pull request #2089 from anx-astocker/master f08cdaee Skip searching /dev/.udev for device nodes. 808e809f doc: First process in container needs `Init: true` 80d35c7c Merge pull request #2082 from AkihiroSuda/blkio-kernel50 dd8b9b14 Merge pull request #2081 from AkihiroSuda/criu312 9ae79017 Merge pull request #2080 from zhlhahaha/pr_id 5e0e67d7 fix permission denied 351bfb4b integration: remove blkio.weight (unavailable in kernel 5.0) 7e678625 Bump CRIU to 3.12 68cc1a77 Update busybox source and fix runc exec bug 6cccc176 Merge pull request #2075 from KentaTada/fix-bash-completion 371d13c9 Update bash completion for v1.0.0 release f4982d86 Merge pull request #2074 from odinuge/dep/libseccomp-golang 652297c7 Update dependency libseccomp-golang 7a9ffa89 Change the permissions of the notify listener socket to rwx for everyone e7831f2a Update to Go 1.12 and drop obsolete versions 2e8efc1b add prompt when rootless users have no read access to runc bin 472fe623 criu image path permission error in rootless checkpoint 056909bd Adds note about user ns for rootless containers d71b3f53 libcontainer/sync: Drop procConsole transaction from comments Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat
-rw-r--r--recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch37
-rw-r--r--recipes-containers/runc/files/0001-Only-allow-proc-mount-if-it-is-procfs.patch201
-rw-r--r--recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch19
-rw-r--r--recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch17
-rw-r--r--recipes-containers/runc/runc-docker_git.bb5
-rw-r--r--recipes-containers/runc/runc-opencontainers_git.bb5
6 files changed, 39 insertions, 245 deletions
diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
index 94cbb4cb..f004a476 100644
--- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
+++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
@@ -9,27 +9,24 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9 Makefile | 3 +-- 9 Makefile | 3 +--
10 1 file changed, 1 insertion(+), 2 deletions(-) 10 1 file changed, 1 insertion(+), 2 deletions(-)
11 11
12diff --git a/Makefile b/Makefile 12Index: git/src/import/Makefile
13index 0f26a1c8..a0c6b40b 100644 13===================================================================
14--- a/src/import/Makefile 14--- git.orig/src/import/Makefile
15+++ b/src/import/Makefile 15+++ git/src/import/Makefile
16@@ -30,7 +30,7 @@ SHELL := $(shell command -v bash 2>/dev/null) 16@@ -23,7 +23,7 @@
17 .DEFAULT: runc 17 GO_BUILDMODE := "-buildmode=pie"
18 endif
19 endif
20-GO_BUILD := $(GO) build $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
21+GO_BUILD := $(GO) build $(GOBUILDFLAGS) $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
22 -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
23 GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
24 -ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
25@@ -40,7 +40,6 @@
18 26
19 runc: $(SOURCES) 27 static:
20- $(GO) build -buildmode=pie $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . 28 $(GO_BUILD_STATIC) -o runc .
21+ $(GO) build $(GOBUILDFLAGS) $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc . 29- $(GO_BUILD_STATIC) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
22
23 all: runc recvtty
24
25@@ -41,7 +41,6 @@ contrib/cmd/recvtty/recvtty: $(SOURCES)
26
27 static: $(SOURCES)
28 CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc .
29- CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
30 30
31 release: 31 release:
32 script/release.sh -r release/$(VERSION) -v $(VERSION) 32 script/release.sh -r release/$(VERSION) -v $(VERSION)
33--
342.17.1
35
diff --git a/recipes-containers/runc/files/0001-Only-allow-proc-mount-if-it-is-procfs.patch b/recipes-containers/runc/files/0001-Only-allow-proc-mount-if-it-is-procfs.patch
deleted file mode 100644
index 5aca99e2..00000000
--- a/recipes-containers/runc/files/0001-Only-allow-proc-mount-if-it-is-procfs.patch
+++ /dev/null
@@ -1,201 +0,0 @@
1From d75b05441772417a0828465a9483f16287937724 Mon Sep 17 00:00:00 2001
2From: Michael Crosby <crosbymichael@gmail.com>
3Date: Mon, 23 Sep 2019 16:45:45 -0400
4Subject: [PATCH] Only allow proc mount if it is procfs
5
6Fixes #2128
7
8This allows proc to be bind mounted for host and rootless namespace usecases but
9it removes the ability to mount over the top of proc with a directory.
10
11```bash
12> sudo docker run --rm apparmor
13docker: Error response from daemon: OCI runtime create failed:
14container_linux.go:346: starting container process caused "process_linux.go:449:
15container init caused \"rootfs_linux.go:58: mounting
16\\\"/var/lib/docker/volumes/aae28ea068c33d60e64d1a75916cf3ec2dc3634f97571854c9ed30c8401460c1/_data\\\"
17to rootfs
18\\\"/var/lib/docker/overlay2/a6be5ae911bf19f8eecb23a295dec85be9a8ee8da66e9fb55b47c841d1e381b7/merged\\\"
19at \\\"/proc\\\" caused
20\\\"\\\\\\\"/var/lib/docker/overlay2/a6be5ae911bf19f8eecb23a295dec85be9a8ee8da66e9fb55b47c841d1e381b7/merged/proc\\\\\\\"
21cannot be mounted because it is not of type proc\\\"\"": unknown.
22
23> sudo docker run --rm -v /proc:/proc apparmor
24
25docker-default (enforce) root 18989 0.9 0.0 1288 4 ?
26Ss 16:47 0:00 sleep 20
27```
28
29Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
30
31Upstream-Status: Backport [https://github.com/opencontainers/runc/pull/2129/commits/331692baa7afdf6c186f8667cb0e6362ea0802b3]
32
33CVE: CVE-2019-16884
34
35Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
36---
37 libcontainer/container_linux.go | 4 +--
38 libcontainer/rootfs_linux.go | 50 +++++++++++++++++++++++--------
39 libcontainer/rootfs_linux_test.go | 8 ++---
40 3 files changed, 43 insertions(+), 19 deletions(-)
41
42diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
43index 7e58e5e0..d51e35df 100644
44--- a/src/import/libcontainer/container_linux.go
45+++ b/src/import/libcontainer/container_linux.go
46@@ -19,7 +19,7 @@ import (
47 "syscall" // only for SysProcAttr and Signal
48 "time"
49
50- "github.com/cyphar/filepath-securejoin"
51+ securejoin "github.com/cyphar/filepath-securejoin"
52 "github.com/opencontainers/runc/libcontainer/cgroups"
53 "github.com/opencontainers/runc/libcontainer/configs"
54 "github.com/opencontainers/runc/libcontainer/intelrdt"
55@@ -1160,7 +1160,7 @@ func (c *linuxContainer) makeCriuRestoreMountpoints(m *configs.Mount) error {
56 if err != nil {
57 return err
58 }
59- if err := checkMountDestination(c.config.Rootfs, dest); err != nil {
60+ if err := checkProcMount(c.config.Rootfs, dest, ""); err != nil {
61 return err
62 }
63 m.Destination = dest
64diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
65index f13b226e..5650b0ac 100644
66--- a/src/import/libcontainer/rootfs_linux.go
67+++ b/src/import/libcontainer/rootfs_linux.go
68@@ -13,7 +13,7 @@ import (
69 "strings"
70 "time"
71
72- "github.com/cyphar/filepath-securejoin"
73+ securejoin "github.com/cyphar/filepath-securejoin"
74 "github.com/mrunalp/fileutils"
75 "github.com/opencontainers/runc/libcontainer/cgroups"
76 "github.com/opencontainers/runc/libcontainer/configs"
77@@ -197,7 +197,7 @@ func prepareBindMount(m *configs.Mount, rootfs string) error {
78 if dest, err = securejoin.SecureJoin(rootfs, m.Destination); err != nil {
79 return err
80 }
81- if err := checkMountDestination(rootfs, dest); err != nil {
82+ if err := checkProcMount(rootfs, dest, m.Source); err != nil {
83 return err
84 }
85 // update the mount with the correct dest after symlinks are resolved.
86@@ -388,7 +388,7 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string, enableCgroupns b
87 if dest, err = securejoin.SecureJoin(rootfs, m.Destination); err != nil {
88 return err
89 }
90- if err := checkMountDestination(rootfs, dest); err != nil {
91+ if err := checkProcMount(rootfs, dest, m.Source); err != nil {
92 return err
93 }
94 // update the mount with the correct dest after symlinks are resolved.
95@@ -435,12 +435,12 @@ func getCgroupMounts(m *configs.Mount) ([]*configs.Mount, error) {
96 return binds, nil
97 }
98
99-// checkMountDestination checks to ensure that the mount destination is not over the top of /proc.
100+// checkProcMount checks to ensure that the mount destination is not over the top of /proc.
101 // dest is required to be an abs path and have any symlinks resolved before calling this function.
102-func checkMountDestination(rootfs, dest string) error {
103- invalidDestinations := []string{
104- "/proc",
105- }
106+//
107+// if source is nil, don't stat the filesystem. This is used for restore of a checkpoint.
108+func checkProcMount(rootfs, dest, source string) error {
109+ const procPath = "/proc"
110 // White list, it should be sub directories of invalid destinations
111 validDestinations := []string{
112 // These entries can be bind mounted by files emulated by fuse,
113@@ -463,16 +463,40 @@ func checkMountDestination(rootfs, dest string) error {
114 return nil
115 }
116 }
117- for _, invalid := range invalidDestinations {
118- path, err := filepath.Rel(filepath.Join(rootfs, invalid), dest)
119+ path, err := filepath.Rel(filepath.Join(rootfs, procPath), dest)
120+ if err != nil {
121+ return err
122+ }
123+ // pass if the mount path is located outside of /proc
124+ if strings.HasPrefix(path, "..") {
125+ return nil
126+ }
127+ if path == "." {
128+ // an empty source is pasted on restore
129+ if source == "" {
130+ return nil
131+ }
132+ // only allow a mount on-top of proc if it's source is "proc"
133+ isproc, err := isProc(source)
134 if err != nil {
135 return err
136 }
137- if path != "." && !strings.HasPrefix(path, "..") {
138- return fmt.Errorf("%q cannot be mounted because it is located inside %q", dest, invalid)
139+ // pass if the mount is happening on top of /proc and the source of
140+ // the mount is a proc filesystem
141+ if isproc {
142+ return nil
143 }
144+ return fmt.Errorf("%q cannot be mounted because it is not of type proc", dest)
145 }
146- return nil
147+ return fmt.Errorf("%q cannot be mounted because it is inside /proc", dest)
148+}
149+
150+func isProc(path string) (bool, error) {
151+ var s unix.Statfs_t
152+ if err := unix.Statfs(path, &s); err != nil {
153+ return false, err
154+ }
155+ return s.Type == unix.PROC_SUPER_MAGIC, nil
156 }
157
158 func setupDevSymlinks(rootfs string) error {
159diff --git a/libcontainer/rootfs_linux_test.go b/libcontainer/rootfs_linux_test.go
160index d755984b..1bfe7c66 100644
161--- a/src/import/libcontainer/rootfs_linux_test.go
162+++ b/src/import/libcontainer/rootfs_linux_test.go
163@@ -10,7 +10,7 @@ import (
164
165 func TestCheckMountDestOnProc(t *testing.T) {
166 dest := "/rootfs/proc/sys"
167- err := checkMountDestination("/rootfs", dest)
168+ err := checkProcMount("/rootfs", dest, "")
169 if err == nil {
170 t.Fatal("destination inside proc should return an error")
171 }
172@@ -18,7 +18,7 @@ func TestCheckMountDestOnProc(t *testing.T) {
173
174 func TestCheckMountDestOnProcChroot(t *testing.T) {
175 dest := "/rootfs/proc/"
176- err := checkMountDestination("/rootfs", dest)
177+ err := checkProcMount("/rootfs", dest, "/proc")
178 if err != nil {
179 t.Fatal("destination inside proc when using chroot should not return an error")
180 }
181@@ -26,7 +26,7 @@ func TestCheckMountDestOnProcChroot(t *testing.T) {
182
183 func TestCheckMountDestInSys(t *testing.T) {
184 dest := "/rootfs//sys/fs/cgroup"
185- err := checkMountDestination("/rootfs", dest)
186+ err := checkProcMount("/rootfs", dest, "")
187 if err != nil {
188 t.Fatal("destination inside /sys should not return an error")
189 }
190@@ -34,7 +34,7 @@ func TestCheckMountDestInSys(t *testing.T) {
191
192 func TestCheckMountDestFalsePositive(t *testing.T) {
193 dest := "/rootfs/sysfiles/fs/cgroup"
194- err := checkMountDestination("/rootfs", dest)
195+ err := checkProcMount("/rootfs", dest, "")
196 if err != nil {
197 t.Fatal(err)
198 }
199--
2002.17.1
201
diff --git a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch
index 48c1250d..bcf4c103 100644
--- a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch
+++ b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch
@@ -12,11 +12,11 @@ Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12 utils_linux.go | 5 +++++ 12 utils_linux.go | 5 +++++
13 1 file changed, 5 insertions(+) 13 1 file changed, 5 insertions(+)
14 14
15diff --git a/utils_linux.go b/utils_linux.go 15Index: git/src/import/utils_linux.go
16index 8085f7fe..e6d31b35 100644 16===================================================================
17--- a/src/import/utils_linux.go 17--- git.orig/src/import/utils_linux.go
18+++ b/src/import/utils_linux.go 18+++ git/src/import/utils_linux.go
19@@ -227,6 +227,11 @@ type runner struct { 19@@ -267,6 +267,11 @@
20 } 20 }
21 21
22 func (r *runner) run(config *specs.Process) (int, error) { 22 func (r *runner) run(config *specs.Process) (int, error) {
@@ -25,9 +25,6 @@ index 8085f7fe..e6d31b35 100644
25+ r.consoleSocket = "" 25+ r.consoleSocket = ""
26+ config.Terminal = false 26+ config.Terminal = false
27+ } 27+ }
28 if err := r.checkTerminal(config); err != nil { 28 var err error
29 r.destroy() 29 defer func() {
30 return -1, err 30 if err != nil {
31--
322.11.0
33
diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
index 0af74952..98b02044 100644
--- a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
+++ b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
@@ -33,15 +33,17 @@ Index: git/src/import/signals.go
33=================================================================== 33===================================================================
34--- git.orig/src/import/signals.go 34--- git.orig/src/import/signals.go
35+++ git/src/import/signals.go 35+++ git/src/import/signals.go
36@@ -6,6 +6,7 @@ 36@@ -5,7 +5,9 @@
37 import (
37 "os" 38 "os"
38 "os/signal" 39 "os/signal"
39 "syscall" // only for Signal 40+ "syscall" // only for Signal
40+ "strconv"
41 41
42+ "strconv"
42 "github.com/opencontainers/runc/libcontainer" 43 "github.com/opencontainers/runc/libcontainer"
43 "github.com/opencontainers/runc/libcontainer/system" 44 "github.com/opencontainers/runc/libcontainer/system"
44@@ -56,9 +57,6 @@ 45 "github.com/opencontainers/runc/libcontainer/utils"
46@@ -55,9 +57,6 @@
45 func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach bool) (int, error) { 47 func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach bool) (int, error) {
46 // make sure we know the pid of our main process so that we can return 48 // make sure we know the pid of our main process so that we can return
47 // after it dies. 49 // after it dies.
@@ -51,12 +53,13 @@ Index: git/src/import/signals.go
51 53
52 pid1, err := process.Pid() 54 pid1, err := process.Pid()
53 if err != nil { 55 if err != nil {
54@@ -68,11 +66,60 @@ 56@@ -67,12 +66,61 @@
55 if h.notifySocket != nil { 57 if h.notifySocket != nil {
56 if detach { 58 if detach {
57 h.notifySocket.run(pid1) 59 h.notifySocket.run(pid1)
58- return 0, nil 60- return 0, nil
59 } 61 }
62 h.notifySocket.run(os.Getpid())
60 go h.notifySocket.run(0) 63 go h.notifySocket.run(0)
61 } 64 }
62 65
@@ -117,7 +120,7 @@ Index: git/src/import/utils_linux.go
117=================================================================== 120===================================================================
118--- git.orig/src/import/utils_linux.go 121--- git.orig/src/import/utils_linux.go
119+++ git/src/import/utils_linux.go 122+++ git/src/import/utils_linux.go
120@@ -347,7 +347,7 @@ 123@@ -349,7 +349,7 @@
121 if err != nil { 124 if err != nil {
122 r.terminate(process) 125 r.terminate(process)
123 } 126 }
@@ -125,4 +128,4 @@ Index: git/src/import/utils_linux.go
125+ if (detach && os.Getenv("SIGUSR1_PARENT_PID") == "") { 128+ if (detach && os.Getenv("SIGUSR1_PARENT_PID") == "") {
126 return 0, nil 129 return 0, nil
127 } 130 }
128 r.destroy() 131 if err == nil {
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index 8d810d01..6b7069ba 100644
--- a/recipes-containers/runc/runc-docker_git.bb
+++ b/recipes-containers/runc/runc-docker_git.bb
@@ -2,12 +2,11 @@ include runc.inc
2 2
3# Note: this rev is before the required protocol field, update when all components 3# Note: this rev is before the required protocol field, update when all components
4# have been updated to match. 4# have been updated to match.
5SRCREV_runc-docker = "425e105d5a03fabd737a126ad93d62a9eeede87f" 5SRCREV_runc-docker = "49a73463331bd8ff44bb8349e33f4b2e1ae34b4f"
6SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \ 6SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \
7 file://0001-runc-Add-console-socket-dev-null.patch \ 7 file://0001-runc-Add-console-socket-dev-null.patch \
8 file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ 8 file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
9 file://0001-runc-docker-SIGUSR1-daemonize.patch \ 9 file://0001-runc-docker-SIGUSR1-daemonize.patch \
10 file://0001-Only-allow-proc-mount-if-it-is-procfs.patch \
11 " 10 "
12 11
13RUNC_VERSION = "1.0.0-rc8" 12RUNC_VERSION = "1.0.0-rc92"
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index 3a7e7aaf..e3e0ac30 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -1,9 +1,8 @@
1include runc.inc 1include runc.inc
2 2
3SRCREV = "652297c7c7e6c94e8d064ad5916c32891a6fd388" 3SRCREV = "49a73463331bd8ff44bb8349e33f4b2e1ae34b4f"
4SRC_URI = " \ 4SRC_URI = " \
5 git://github.com/opencontainers/runc;branch=master \ 5 git://github.com/opencontainers/runc;branch=master \
6 file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ 6 file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
7 file://0001-Only-allow-proc-mount-if-it-is-procfs.patch \
8 " 7 "
9RUNC_VERSION = "1.0.0-rc8" 8RUNC_VERSION = "1.0.0-rc92"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-14 19:13:08 +0000