3f83b3fd4f
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/ostree#4f9cacf8d3f63777d4ebf5cbce1c92f952bb78f2
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From b3dc074f5ed6d3a1e40dbc1e3315a518512d3c63 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Lebon <jonathan@jlebon.com>
|
|
Date: Wed, 7 Oct 2020 14:44:25 -0400
|
|
Subject: [PATCH] lib/deploy: Don't leak fd when checksumming dtbs
|
|
|
|
Likely the root of https://bugzilla.redhat.com/show_bug.cgi?id=1886149.
|
|
---
|
|
src/libostree/ostree-sysroot-deploy.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
|
|
index 1c4fb5dc..7b7ba5e9 100644
|
|
--- a/src/libostree/ostree-sysroot-deploy.c
|
|
+++ b/src/libostree/ostree-sysroot-deploy.c
|
|
@@ -272,13 +272,13 @@ checksum_dir_recurse (int dfd,
|
|
}
|
|
else
|
|
{
|
|
- int fd;
|
|
+ glnx_autofd int fd = -1;
|
|
|
|
if (!ot_openat_ignore_enoent (dfditer.fd, d_name, &fd, error))
|
|
return FALSE;
|
|
if (fd != -1)
|
|
{
|
|
- g_autoptr(GInputStream) in = g_unix_input_stream_new (fd, FALSE);
|
|
+ g_autoptr(GInputStream) in = g_unix_input_stream_new (glnx_steal_fd (&fd), TRUE);
|
|
if (!ot_gio_splice_update_checksum (NULL, in, checksum, cancellable, error))
|
|
return FALSE;
|
|
}
|
|
--
|
|
2.26.2
|
|
|