diff --git a/git-commit b/git-commit index f28100d11d591ac4d33b38fe9af48db959b3d46e..258f1f79a6573adb50a18a54516a30624cd88554 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -caecfec06584770e48dcfba57461f7b89e08babe +9b47ea11a903817a64b3d14fc8a7b88835bd1a00 diff --git a/patch/0030-runc-support-specify-umask.patch b/patch/0030-runc-support-specify-umask.patch new file mode 100644 index 0000000000000000000000000000000000000000..c3ece811922728b506bc293d150ecfe0ba18d280 --- /dev/null +++ b/patch/0030-runc-support-specify-umask.patch @@ -0,0 +1,57 @@ +From 9e76966232e71cfabc2553c6a0dee1f59ee9216c Mon Sep 17 00:00:00 2001 +From: zhongjiawei +Date: Sat, 17 Dec 2022 11:18:41 +0800 +Subject: [PATCH] runc:support specify umask + +--- + libcontainer/rootfs_linux.go | 7 ++++++- + libcontainer/setns_init_linux.go | 8 ++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go +index a1bd7e7..b005429 100644 +--- a/libcontainer/rootfs_linux.go ++++ b/libcontainer/rootfs_linux.go +@@ -140,7 +140,12 @@ func finalizeRootfs(config *configs.Config) (err error) { + } + } + +- syscall.Umask(0022) ++ umask := libcontainerUtils.SearchLabels(config.Labels, "native.umask") ++ if umask == "normal" { ++ syscall.Umask(0022) ++ } else { ++ syscall.Umask(0027) ++ } + return nil + } + +diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go +index e6dfbba..1f7ec98 100644 +--- a/libcontainer/setns_init_linux.go ++++ b/libcontainer/setns_init_linux.go +@@ -11,6 +11,7 @@ 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" + ) + +@@ -42,6 +43,13 @@ 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 52fccad5f69f9dc3bfb122d6a5230ee7e0b7ef00..6a90bb2d58ff169fa936bc02cdeaf624b66cdb75 100644 --- a/runc.spec +++ b/runc.spec @@ -3,7 +3,7 @@ Name: docker-runc Version: 1.1.3 -Release: 6 +Release: 7 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification. License: ASL 2.0 @@ -54,6 +54,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc %{_bindir}/runc %changelog +* Sat Dec 17 2022 zhongjiawei - 1.1.3-7 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:support specify umask + * Mon Nov 7 2022 zhongjiawei - 1.1.3-6 - Type:bugfix - CVE:NA diff --git a/series.conf b/series.conf index 0a542b9b5d94d7ee5b08485281bc55a772c9ba51..babae95132d22b57a4c802870d98061422589006 100644 --- a/series.conf +++ b/series.conf @@ -27,3 +27,4 @@ patch/0026-runc-add-DT-for-cpuset.preferred_cpus-setting.patch patch/0027-runc-modify-runc-Makefile.patch patch/0028-runc-cgroup-apply-method-modify.patch patch/0029-runc-runc-log-forward-to-syslog.patch +patch/0030-runc-support-specify-umask.patch