diff --git a/patch/0132-runc-change-Umask-to-0022.patch b/patch/0132-runc-change-Umask-to-0022.patch new file mode 100644 index 0000000000000000000000000000000000000000..63a562d503c6d4e96b498cbfe33b2ec57c3b7fa9 --- /dev/null +++ b/patch/0132-runc-change-Umask-to-0022.patch @@ -0,0 +1,57 @@ +From f53243d64903d660e45a186dc11fa0ab13c39621 Mon Sep 17 00:00:00 2001 +From: zhongjiawei +Date: Tue, 9 Aug 2022 18:29:53 +0800 +Subject: [PATCH] runc: change Umask to 0022 + +--- + libcontainer/rootfs_linux.go | 7 +------ + libcontainer/setns_init_linux.go | 8 -------- + 2 files changed, 1 insertion(+), 14 deletions(-) + +diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go +index b005429..a1bd7e7 100644 +--- a/libcontainer/rootfs_linux.go ++++ b/libcontainer/rootfs_linux.go +@@ -140,12 +140,7 @@ func finalizeRootfs(config *configs.Config) (err error) { + } + } + +- umask := libcontainerUtils.SearchLabels(config.Labels, "native.umask") +- if umask == "normal" { +- syscall.Umask(0022) +- } else { +- syscall.Umask(0027) +- } ++ syscall.Umask(0022) + return nil + } + +diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go +index 1f7ec98..e6dfbba 100644 +--- a/libcontainer/setns_init_linux.go ++++ b/libcontainer/setns_init_linux.go +@@ -11,7 +11,6 @@ import ( + "github.com/opencontainers/runc/libcontainer/keys" + "github.com/opencontainers/runc/libcontainer/seccomp" + "github.com/opencontainers/runc/libcontainer/system" +- "github.com/opencontainers/runc/libcontainer/utils" + "github.com/opencontainers/selinux/go-selinux/label" + ) + +@@ -43,13 +42,6 @@ func (l *linuxSetnsInit) Init() error { + return err + } + } +- // set exec process umask to 0027 or 0022 according to container's config +- umask := utils.SearchLabels(l.config.Config.Labels, "native.umask") +- if umask == "normal" { +- syscall.Umask(0022) +- } else { +- syscall.Umask(0027) +- } + if l.config.NoNewPrivileges { + if err := system.Prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); err != nil { + return err +-- +2.30.0 + diff --git a/runc.spec b/runc.spec index d72662e09c605384f8a6ae4684d0e9c2a7da02d1..67efd82902487313835efd19c84b2ae2f33dcbb7 100644 --- a/runc.spec +++ b/runc.spec @@ -3,7 +3,7 @@ Name: docker-runc Version: 1.1.3 -Release: 1 +Release: 2 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification. License: ASL 2.0 @@ -43,6 +43,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc %{_bindir}/runc %changelog +* Tue Aug 9 2022 zhongjiawei - 1.1.3-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:change Uamsk to 0022 + * Tue Aug 9 2022 wangjunqi - 1.1.3-1 - update to 1.1.3 diff --git a/series.conf b/series.conf index f279a70a94578738702f85e4cbd8185223fb971b..7fc2b53dd405c0066811b816c0609db4f3d30da9 100644 --- a/series.conf +++ b/series.conf @@ -129,4 +129,5 @@ patch/0128-runc-optimize-nsexec-logging.patch patch/0129-runc-improve-log-for-debugging.patch patch/0130-runc-fix-cgroup-info-print-error.patch patch/0131-runc-save-state-atomic.patch +patch/0132-runc-change-Umask-to-0022.patch #end