diff --git a/VERSION-vendor b/VERSION-vendor index 48ca1c7bcf0c04063706bced733cf635cf4f4603..395642b67e2b1ad21d830b4b9d4de6e94c392505 100644 --- a/VERSION-vendor +++ b/VERSION-vendor @@ -1 +1 @@ -18.09.0.336 +18.09.0.338 diff --git a/docker.spec b/docker.spec index 39aa44192194478fbd424800dda77dd46303608a..c5c89a710302a8fb4634212f68aff43bbbb2ac21 100644 --- a/docker.spec +++ b/docker.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 336 +Release: 338 Epoch: 2 Summary: The open-source application container engine Group: Tools/Docker @@ -213,6 +213,12 @@ fi %endif %changelog +* Mon Jul 15 2024 chenjiankun - 18.09.0-338 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:Ignore SIGURG on Linux + * Wed May 08 2024 chenjiankun - 18.09.0-336 - Type:CVE - CVE:CVE-2024-32473 diff --git a/git-commit b/git-commit index aa7485260e98d01f7e6669b9aa8ba0a0ebca1248..7297e2e45c3538e21045d96132f45841bda877ed 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -33f6ee35033ba46754532d87ae6800eca565cb26 +a08d4cca7068a32e0d0af533c6e01aacc3f525ff diff --git a/patch/0276-docker-Ignore-SIGURG-on-Linux.patch b/patch/0276-docker-Ignore-SIGURG-on-Linux.patch new file mode 100644 index 0000000000000000000000000000000000000000..34006aa4fd0452f956dd150528a1cd604dd2740b --- /dev/null +++ b/patch/0276-docker-Ignore-SIGURG-on-Linux.patch @@ -0,0 +1,42 @@ +From 96b2c9ecfbd1ebaae8353c1131e6ed8a0c3de65b Mon Sep 17 00:00:00 2001 +From: chenjiankun +Date: Fri, 21 Jun 2024 16:39:55 +0800 +Subject: [PATCH] docker: Ignore SIGURG on Linux + +In go1.14+, SIGURG is used by the runtime to handle preemtable system +calls. +In practice this signal caught *frequently*. + +For reference: + +https://go.googlesource.com/proposal/+/master/design/24543-non-cooperative-preemption.md +golang/go#37942 +https://github.com/docker/cli/commit/fff164c22e8dc904291fecb62307312fd4ca153e +--- + components/cli/cli/command/container/tty.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/components/cli/cli/command/container/tty.go b/components/cli/cli/command/container/tty.go +index cb49ded8e..5a914b109 100644 +--- a/components/cli/cli/command/container/tty.go ++++ b/components/cli/cli/command/container/tty.go +@@ -13,6 +13,7 @@ import ( + "github.com/docker/docker/client" + "github.com/docker/docker/pkg/signal" + "github.com/sirupsen/logrus" ++ "golang.org/x/sys/unix" + ) + + // resizeTtyTo resizes tty to specific height and width +@@ -79,7 +80,7 @@ func ForwardAllSignals(ctx context.Context, cli command.Cli, cid string) chan os + signal.CatchAll(sigc) + go func() { + for s := range sigc { +- if s == signal.SIGCHLD || s == signal.SIGPIPE { ++ if s == signal.SIGCHLD || s == signal.SIGPIPE || s == unix.SIGURG { + continue + } + var sig string +-- +2.33.0 + diff --git a/series.conf b/series.conf index 3fa752a0c3c8f8c22d484b7a096480d93333f458..673b6542b39eb92279bee9a0f8fa988d5de014e5 100644 --- a/series.conf +++ b/series.conf @@ -270,4 +270,5 @@ patch/0272-Fixes-41871-Update-daemon-daemon.go-resume-healthche.patch patch/0273-backport-fix-CVE-2024-24557.patch patch/0274-docker-fix-CVE-2024-29018.patch patch/0275-backport-fix-CVE-2024-32473.patch +patch/0276-docker-Ignore-SIGURG-on-Linux.patch #end