mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
libxl: Hold the atfork lock while closing carefd
This avoids the process being forked while a carefd is recorded in the list but the actual fd has been closed. If that happened, a subsequent libxl_postfork_child_noexec would attempt to close the fd again. If we are lucky that results in a harmless warning; but if we are unlucky the fd number has been reused and we close an unrelated fd. This race has not been observed anywhere as far as we are aware. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <Ian.Campbell@citrix.com> CC: George Dunlap <george.dunlap@eu.citrix.com>
This commit is contained in:
1 parent
5f979614ea
commit
2a0c3a62ea
1 file changed
+1
-1
@@ -184,9 +184,9 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx)
|
||||
int libxl__carefd_close(libxl__carefd *cf)
|
||||
{
|
||||
if (!cf) return 0;
|
||||
atfork_lock();
|
||||
int r = cf->fd < 0 ? 0 : close(cf->fd);
|
||||
int esave = errno;
|
||||
atfork_lock();
|
||||
LIBXL_LIST_REMOVE(cf, entry);
|
||||
atfork_unlock();
|
||||
free(cf);
|
||||
|
||||