diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-12-20 01:06:22 -0800 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-12-20 18:24:40 -0800 |
| commit | 9a427bcfdbc830b53654d918d3346d3c5e23c8d1 (patch) | |
| tree | 4a56112fddfbd52195b261f1d5d0f5b8f62a5bc8 /app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch | |
| parent | Move {app-emulation -> app-containers}/lxc-templates (diff) | |
| download | gentoo-9a427bcfdbc830b53654d918d3346d3c5e23c8d1.tar.gz gentoo-9a427bcfdbc830b53654d918d3346d3c5e23c8d1.tar.bz2 gentoo-9a427bcfdbc830b53654d918d3346d3c5e23c8d1.zip | |
Move {app-emulation -> app-containers}/lxc
Closes: https://github.com/gentoo/gentoo/pull/23428
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch')
| -rw-r--r-- | app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch b/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch deleted file mode 100644 index 33b8554193d3..000000000000 --- a/app-emulation/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a585382b972c25ee8489147d94918d001ef439a7 Mon Sep 17 00:00:00 2001 -From: Christian Brauner <christian.brauner@ubuntu.com> -Date: Thu, 28 Oct 2021 17:39:42 +0200 -Subject: [PATCH] start: check event loop type before closing fd - -Since this is a union we might otherwise stomp on io_uring mmap()ed -memory. - -Fixes: #4016 -Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> ---- - src/lxc/start.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lxc/start.c b/src/lxc/start.c -index 8f7173ec8c..1a6046c7a4 100644 ---- a/src/lxc/start.c -+++ b/src/lxc/start.c -@@ -629,7 +629,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler) - TRACE("Mainloop is ready"); - - ret = lxc_mainloop(&descr, -1); -- close_prot_errno_disarm(descr.epfd); -+ if (descr.type == LXC_MAINLOOP_EPOLL) -+ close_prot_errno_disarm(descr.epfd); - if (ret < 0 || !handler->init_died) - goto out_mainloop_console; - |