24 Commits

Author SHA1 Message Date
Lu Jingxiao
c2d8b3d476 cio: FIFOSet.Close() check if FIFOSet is nill to prevent NPE
Reference:6a2d3990d1

Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com>
(cherry picked from commit e2ac8064dedf7540f776d2a5c287a4ed1fa15f2b)
2024-03-05 10:01:51 +08:00
zhongjiawei
88477bca6e containerd:disable Transparent HugePage for shim process if SHIM_DISABLE_THP is set
(cherry picked from commit 0b41680949f9f0a8518fa1932a3ab469bd2764ec)
2024-02-23 15:23:49 +08:00
zhongjiawei
4bf1ad0c53 containerd:update vendored golang.org/x/net
(cherry picked from commit 2af6d2826a887bd399e9af2656c4cd59aa29a1f7)
2024-02-06 16:16:47 +08:00
zhongjiawei
4b1c9ac975 containerd: fix CVE-2023-39325
(cherry picked from commit 7e7607cc8e11da0a66bd82a997f2064ee1f3b166)
2024-01-30 15:26:59 +08:00
zhongjiawei
23d3fdb129 containerd:symc some patches
(cherry picked from commit df5431744ecee9e4aeb33a52278fec636909cb42)
2023-12-21 16:49:26 +08:00
zhongjiawei
12606dce93 containerd:bump ttrpc to fix containerd-shim socket connect increase leak after restart docker
(cherry picked from commit 6da25d17bd95cbbe986f0bc55f95a4dda6adb39a)
2023-11-08 16:57:53 +08:00
panchenbo
8b542090b3 sync some patchs form SP1 2023-09-22 13:58:07 +08:00
zhongjiawei
8f3e5afd4d containerd:fix journald stop container shim log stuck bug 2023-06-16 16:19:30 +08:00
zhongjiawei
28c9716817 containerd:fix CVE-2023-25153 and CVE-2023-25173
(cherry picked from commit ca79c58f4e11665304c905b0528d6ae77f4b6aa4)
2023-02-27 17:24:31 +08:00
zhongjiawei
2f615ddb8f containerd:fix k8s build fail without import context
(cherry picked from commit cf1b0bc6ef5c80f78b1012246cd312b4dfa1c9a4)
2022-12-15 17:00:06 +08:00
zhongjiawei
851807d47a containerd:Fix goroutine leak in Exec
(cherry picked from commit 9fc75e44814de33a73f690764c2de4c7e9495efc)
2022-12-13 19:03:14 +08:00
zhongjiawei
61ec51a929 containerd: fix version number wrong
(cherry picked from commit 6bbb86302fbc7c085c3f63d7e9cdd41570101549)
2022-11-16 14:31:04 +08:00
zhongjiawei
a5844a0a7a containerd: bugfix and add CGO security build option
(cherry picked from commit eb136438cf63fae5754c31920a6bf8afaeded135)
2022-09-22 19:38:37 +08:00
zhongjiawei
1cecbd1328 containerd: Limit the response size of ExecSync
fix CVE-2022-31030

Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com>
(cherry picked from commit 0436d058b39572dfa0d0a267b0518fd8a793dc49)
2022-09-22 16:12:30 +08:00
zhangsong234
4e69ecc42c containerd:put get pid lock after set process exited to avoid deadlock
Signed-off-by: zhangsong234 <zhangsong34@huawei.com>
(cherry picked from commit 5cff2144523054a3492c916f9acacc9a34b2a24f)
2022-07-04 16:26:03 +08:00
duyiwei
50373873fc containerd:Use fs.RootPath when mounting volumes 2022-05-23 10:32:11 +08:00
Vanient
048f008c4f containerd: update patches
0069-containerd-add-check-in-spec.patch
0070-containerd-kill-container-init-process-if-runc-start.patch
0071-containerd-fix-containerd-shim-residual-when-kill-co.patch
0072-containerd-fix-deadlock-on-commit-error.patch
0073-containerd-backport-upstream-patches.patch
0074-containerd-fix-exec-event-missing-due-to-pid-reuse.patch
0075-containerd-fix-dm-left-when-pause-contaienr-and-kill-shim.patch
0076-containerd-fix-start-container-failed-with-id-exists.patch
0077-containerd-drop-opt-package.patch
0078-containerd-bump-containerd-ttrpc-699c4e40d1.patch
0079-containerd-fix-race-access-for-mobySubcribed.patch
0080-containerd-improve-log-for-debugging.patch
0081-containerd-reduce-permissions-for-bundle-di.patch
0082-containerd-fix-publish-command-wait-block-for.patch
0083-containerd-optimize-cgo-compile-options.patch

Signed-off-by:songyanting <songyanting@huawei.com>
Signed-off-by: Vanient <xiadanni1@huawei.com>
(cherry picked from commit 9bf55eea9cc2c493286e993f49e1ff856f37b4ec)
2022-03-23 09:45:57 +08:00
xiadanni
9c4ff3a46f containerd: compile option compliance
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2021-03-18 10:42:53 +08:00
xiadanni
349a80d77f sync patches
1. check task list to avoid unnecessary cleanup.
2. fix dead loop
3. cleanup dangling shim by brand new context
4. fix potential panic for task in unknown state

Signed-off-by: xiadanni <xiadanni1@huawei.com>
2021-03-18 10:20:49 +08:00
yangyanchao
056f26dd1e containerd:all:add some symbol for riscv 2021-01-15 03:26:45 +00:00
xiadanni
dccab1cbca 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 11:08:13 +08:00
liuzekun
bada571c96 containerd: use git-commit to store commit ID
Signed-off-by: liuzekun <liuzekun@huawei.com>
2020-06-15 04:54:01 -04:00
Grooooot
3a981f1909 containerd:add patches
Signed-off-by: Grooooot <isula@huawei.com>
2020-03-05 15:54:34 +08:00
Grooooot
7b8aa4184d first commit 2019-12-30 12:24:38 +08:00