From 7d2fdbd3d6ed93771bbf549c29f1cf787daacf12 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 16 Nov 2023 09:36:40 +0000 Subject: [PATCH] import CS runc-1.1.5-2.module_el8+717+c1ebe428 --- .gitignore | 2 +- .runc.metadata | 2 +- SOURCES/3468.patch | 84 ---------------------------------------------- SPECS/runc.spec | 18 ++++++++-- 4 files changed, 17 insertions(+), 89 deletions(-) delete mode 100644 SOURCES/3468.patch diff --git a/.gitignore b/.gitignore index 9cc4d0e..88f4981 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.1.4.tar.gz +SOURCES/v1.1.5.tar.gz diff --git a/.runc.metadata b/.runc.metadata index d124f3f..214b28b 100644 --- a/.runc.metadata +++ b/.runc.metadata @@ -1 +1 @@ -fb65327930c41c8ec016badd6738bef83b556aed SOURCES/v1.1.4.tar.gz +ad45aea7b8f05ffd428bc9fa1aa0ebec76604479 SOURCES/v1.1.5.tar.gz diff --git a/SOURCES/3468.patch b/SOURCES/3468.patch deleted file mode 100644 index a02339d..0000000 --- a/SOURCES/3468.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 2ce40b6ad72b4bd4391380cafc5ef1bad1fa0b31 Mon Sep 17 00:00:00 2001 -From: Kir Kolyshkin -Date: Wed, 4 May 2022 14:56:16 -0700 -Subject: [PATCH] Remove tun/tap from the default device rules - -Looking through git blame, this was added by commit 9fac18329 -aka "Initial commit of runc binary", most probably by mistake. - -Obviously, a container should not have access to tun/tap device, unless -it is explicitly specified in configuration. - -Now, removing this might create a compatibility issue, but I see no -other choice. - -Aside from the obvious misconfiguration, this should also fix the -annoying - -> Apr 26 03:46:56 foo.bar systemd[1]: Couldn't stat device /dev/char/10:200: No such file or directory - -messages from systemd on every container start, when runc uses systemd -cgroup driver, and the system runs an old (< v240) version of systemd -(the message was presumably eliminated by [1]). - -[1] https://github.com/systemd/systemd/pull/10996/commits/d5aecba6e0b7c73657c4cf544ce57289115098e7 - -Signed-off-by: Kir Kolyshkin ---- - .../ebpf/devicefilter/devicefilter_test.go | 19 ++++++------------- - libcontainer/specconv/spec_linux.go | 10 ---------- - 2 files changed, 6 insertions(+), 23 deletions(-) - -diff --git a/libcontainer/cgroups/ebpf/devicefilter/devicefilter_test.go b/libcontainer/cgroups/ebpf/devicefilter/devicefilter_test.go -index d279335821..25703be5ad 100644 ---- a/libcontainer/cgroups/ebpf/devicefilter/devicefilter_test.go -+++ b/libcontainer/cgroups/ebpf/devicefilter/devicefilter_test.go -@@ -120,21 +120,14 @@ block-8: - 51: Mov32Imm dst: r0 imm: 1 - 52: Exit - block-9: --// tuntap (c, 10, 200, rwm, allow) -+// /dev/pts (c, 136, wildcard, rwm, true) - 53: JNEImm dst: r2 off: -1 imm: 2 -- 54: JNEImm dst: r4 off: -1 imm: 10 -- 55: JNEImm dst: r5 off: -1 imm: 200 -- 56: Mov32Imm dst: r0 imm: 1 -- 57: Exit -+ 54: JNEImm dst: r4 off: -1 imm: 136 -+ 55: Mov32Imm dst: r0 imm: 1 -+ 56: Exit - block-10: --// /dev/pts (c, 136, wildcard, rwm, true) -- 58: JNEImm dst: r2 off: -1 imm: 2 -- 59: JNEImm dst: r4 off: -1 imm: 136 -- 60: Mov32Imm dst: r0 imm: 1 -- 61: Exit --block-11: -- 62: Mov32Imm dst: r0 imm: 0 -- 63: Exit -+ 57: Mov32Imm dst: r0 imm: 0 -+ 58: Exit - ` - var devices []*devices.Rule - for _, device := range specconv.AllowedDevices { -diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go -index 5ae95c6c18..83c7a2c348 100644 ---- a/libcontainer/specconv/spec_linux.go -+++ b/libcontainer/specconv/spec_linux.go -@@ -302,16 +302,6 @@ var AllowedDevices = []*devices.Device{ - Allow: true, - }, - }, -- // tuntap -- { -- Rule: devices.Rule{ -- Type: devices.CharDevice, -- Major: 10, -- Minor: 200, -- Permissions: "rwm", -- Allow: true, -- }, -- }, - } - - type CreateOpts struct { diff --git a/SPECS/runc.spec b/SPECS/runc.spec index 447ccd0..d16bb1b 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -22,8 +22,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: %{repo} -Version: 1.1.4 -Release: 1%{?dist} +Version: 1.1.5 +Release: 2%{?dist} Summary: CLI for running Open Containers # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures #ExclusiveArch: %%{go_arches} @@ -33,7 +33,6 @@ ExcludeArch: %{ix86} License: ASL 2.0 URL: %{git0} Source0: %{git0}/archive/v%{version}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/opencontainers/runc/pull/3468.patch Provides: oci-runtime BuildRequires: golang >= 1.17.7 BuildRequires: git @@ -86,6 +85,19 @@ make install install-man install-bash DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} %{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Jun 15 2023 Jindrich Novy - 1:1.1.5-2 +- rebuild for following CVEs: +CVE-2022-41724 +- Resolves: #2179971 + +* Fri Mar 31 2023 Jindrich Novy - 1:1.1.5-1 +- update to https://github.com/opencontainers/runc/releases/tag/v1.1.5 +- Resolves: #2176108 + +* Tue Mar 14 2023 Jindrich Novy - 1:1.1.4-2 +- update to https://github.com/opencontainers/runc/releases/tag/v1.1.4 +- Related: #2176055 + * Mon Aug 29 2022 Jindrich Novy - 1:1.1.4-1 - update to https://github.com/opencontainers/runc/releases/tag/v1.1.4 - Related: #2061390