34 Commits

Author SHA1 Message Date
zhongjiawei
05fd9f2618 containerd:bump ttrpc to fix containerd-shim socket connect increase leak after restart docker
(cherry picked from commit a7b416dd8a8cd4b3b270ba5b3dd177a0e09f86a1)
2023-11-08 16:57:39 +08:00
openeuler-ci-bot
307a8fb658
!110 [sync] PR-108: containerd:sync some patches
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-09-19 09:00:02 +00:00
zhongjiawei
c2db3a0238 containerd:sync some patches
(cherry picked from commit f5c0eb343e044dcbeda145a0c7bfb604661f724d)
2023-09-19 16:29:38 +08:00
openeuler-ci-bot
35bae5d9ef
!102 [sync] PR-101: 修复可靠性测试中containerd相关目录资源残留问题
From: @openeuler-sync-bot 
Reviewed-by: @zhong-jiawei-1, @duguhaotian 
Signed-off-by: @duguhaotian
2023-08-29 02:52:03 +00:00
flyflyflypeng
20b8a322fe containerd: remove socket file when get file fd failed
fix #I7VZ9J

Signed-off-by: flyflyflypeng <jiangpengfei9@huawei.com>
(cherry picked from commit f4314719446356d1eea80029a8c1b987805785be)
2023-08-28 15:17:37 +08:00
openeuler-ci-bot
d933f68bb6
!95 [sync] PR-93: containerd:fix journald stop container shim log stuck bug
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-06-19 01:14:42 +00:00
zhongjiawei
1a012e9ab2 containerd:fix journald stop container shim log stuck bug
(cherry picked from commit 58858265d4a2e36f363e469b5a2f7eaa350cb4c6)
2023-06-16 17:25:41 +08:00
openeuler-ci-bot
f210171276
!79 containerd:fix CVE-2023-25153 and CVE-2023-25173
From: @zhong-jiawei-1 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2023-02-27 09:24:23 +00:00
zhongjiawei
22b6fcadc2 containerd:fix CVE-2023-25153 and CVE-2023-25173 2023-02-27 16:50:57 +08:00
openeuler-ci-bot
e59061bc30
!68 [sync] PR-66: containerd:fix k8s build fail without import context
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-12-15 09:18:14 +00:00
zhongjiawei
be24f5d29b containerd:fix k8s build fail without import context
(cherry picked from commit 10b7a7b42500ed03efdebf932980de98f19a9558)
2022-12-15 16:59:48 +08:00
openeuler-ci-bot
48b055035b
!63 [sync] PR-62: containerd:Fix CVE-2022-23471
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian, @Vanient 
Signed-off-by: @duguhaotian
2022-12-13 11:45:21 +00:00
zhongjiawei
649cf3941f containerd:Fix goroutine leak in Exec
(cherry picked from commit 77530a43d1408b65ed868dff7d8062781e892336)
2022-12-13 18:35:59 +08:00
openeuler-ci-bot
e343d9bfd0
!60 [sync] PR-57: containerd: add ctr binary into package
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-11-16 08:53:15 +00:00
zhongjiawei
cee6e7b310 containerd: add ctr binary into package
(cherry picked from commit 5876c9e6d9925fbfb536a16dbf6e925a9f50a5bf)
2022-11-16 16:42:11 +08:00
openeuler-ci-bot
be88b9a6d1
!55 [sync] PR-54: containerd: fix version number wrong
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-11-16 08:40:35 +00:00
zhongjiawei
2722620407 containerd: fix version number wrong
(cherry picked from commit 34bbfdb93d4fb6f94f70b6abedd832f32d869670)
2022-11-16 15:15:01 +08:00
openeuler-ci-bot
0eee35ff66
!46 [sync] PR-44: containerd:bugfix fix and add CGO security build options
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-09-22 11:38:32 +00:00
zhongjiawei
750d0bfb56 containerd: bugfix and add CGO serurity build option
(cherry picked from commit ec5896c6deaa050bfc185cfc9b464f7c8b859fe2)
2022-09-22 17:30:49 +08:00
openeuler-ci-bot
6eefb36146
!40 [sync] PR-37: fix CVE-2022-31030
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2022-07-04 09:24:32 +00:00
zhongjiawei
9b138c21c6 containerd: Limit the response size of ExecSync
fix CVE-2022-31030

Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com>
(cherry picked from commit 7487fa60ebe4d7110aa2cfdbcd30ade91760263d)
2022-07-04 16:26:42 +08:00
openeuler-ci-bot
d6e19e9551
!32 [sync] PR-30: containerd:Use fs.RootPath when mounting volumes
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2022-04-27 01:42:37 +00:00
Vanient
e12947bfb5 containerd:Use fs.RootPath when mounting volumes
fix CVE-2022-23648

Signed-off-by: Vanient <xiadanni1@huawei.com>
(cherry picked from commit 1c20efac8910ccd8180a341eca90db76442b8fef)
2022-04-26 20:49:12 +08:00
openeuler-ci-bot
25bd1e565d !23 [sync] PR-20: containerd:reduce permissions for bundle dir to fix CVE-2021-41103
From: @openeuler-sync-bot
Reviewed-by: @caihaomin
Signed-off-by: @caihaomin
2021-11-09 11:28:37 +00:00
xiadanni
c5a97831ab containerd:reduce permissions for bundle dir to fix CVE-2021-41103
upstream:
6886c6a2ec
v1 runtime: reduce permissions for bundle dir

7c621e1fcc
btrfs: reduce permissions on plugin directories

Signed-off-by: xiadanni <xiadanni1@huawei.com>
(cherry picked from commit b4bc26bf252f387c3b26ace2ee20972a67530388)
2021-11-06 17:40:34 +08:00
openeuler-ci-bot
e673f35121 !15 containerd: sync bugfix and bump version
From: @Vanient
Reviewed-by: @jing-rui,@caihaomin
Signed-off-by: @caihaomin
2021-03-05 14:13:02 +08:00
xiadanni
666217db33 containerd: sync bugfix and bump version
Signed-off-by: xiadanni <xiadanni1@huawei.com>

Conflicts:
	containerd.spec
2021-03-05 11:16:23 +08:00
openeuler-ci-bot
9e370bc3b6 !8 containerd: update patches
From: @Vanient
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-11-26 15:28:34 +08:00
xiadanni
155deff118 containerd: update patches
0059-containerd-add-GO_GCFLAGS-to-containerd-shim-making.patch
0060-containerd-do-not-disable-cgo-in-containerd-shim-mak.patch
0061-containerd-check-if-bundle-exists-before-create-bund.patch
0062-containerd-use-path-based-socket-for-shims.patch
0063-containerd-kill-init-directly-if-runtime-kill-failed.patch

Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-11-25 20:05:42 +08:00
openeuler-ci-bot
93cdc66ff6 !2 containerd: add patches
Merge pull request !2 from Grooooot/master
2020-03-06 17:28:16 +08:00
Grooooot
3a981f1909 containerd:add patches
Signed-off-by: Grooooot <isula@huawei.com>
2020-03-05 15:54:34 +08:00
openeuler-ci-bot
4848bdbebd !1 first commit
Merge pull request !1 from openeuler-basic/master
2019-12-30 14:15:03 +08:00
Grooooot
7b8aa4184d first commit 2019-12-30 12:24:38 +08:00
openeuler-ci-bot
cc4fbfeb56 Initial commit 2019-12-30 11:44:37 +08:00