Skip to content

Commit

Permalink
ostree: backport Curl patch
Browse files Browse the repository at this point in the history
An issue was found during some automated tests, and it was related to
OSTree. Looking upstream, there was already an issue opened about this
[2], and a fix was recently published [1].
Since this is only available on v2024.9 and were some version behind, we
backported this patch.

Related-to: TOR-3649

[1] ostreedev/ostree@4d755a8
[2] ostreedev/ostree#3299

Signed-off-by: Eduardo Ferreira <[email protected]>
EdTheBearded committed Nov 22, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 7292278 commit 8e61a33
Showing 2 changed files with 63 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
From 4d755a85225ea0a02d4580d088bb8a97138cb040 Mon Sep 17 00:00:00 2001
From: Colin Walters <[email protected]>
Date: Wed, 18 Sep 2024 13:41:59 -0400
Subject: [PATCH] curl: Make socket callback during cleanup into no-op

Because curl_multi_cleanup may invoke callbacks, we effectively have
some circular references going on here. See discussion in

https://github.com/curl/curl/issues/14860

Basically what we do is the socket callback libcurl may invoke into a no-op when
we detect we're finalizing. The data structures are owned by this object and
not by the callbacks, and will be destroyed below. Note that
e.g. g_hash_table_unref() may itself invoke callbacks, which is where
some data is cleaned up.

Upstream-Status: Backport [https://github.com/ostreedev/ostree/pull/3307/commits/4d755a85225ea0a02d4580d088bb8a97138cb040]

Signed-off-by: Colin Walters <[email protected]>
---
src/libostree/ostree-fetcher-curl.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c
index d6902893ff..8054812f57 100644
--- a/src/libostree/ostree-fetcher-curl.c
+++ b/src/libostree/ostree-fetcher-curl.c
@@ -78,6 +78,7 @@ struct OstreeFetcher
struct curl_slist *extra_headers;
int tmpdir_dfd;
bool force_anonymous;
+ bool finalizing; // Set if we're in the process of teardown
char *custom_user_agent;
guint32 opt_low_speed_limit;
guint32 opt_low_speed_time;
@@ -180,6 +181,15 @@ _ostree_fetcher_finalize (GObject *object)
{
OstreeFetcher *self = OSTREE_FETCHER (object);

+ // Because curl_multi_cleanup may invoke callbacks, we effectively have
+ // some circular references going on here. See discussion in
+ // https://github.com/curl/curl/issues/14860
+ // Basically what we do is make most callbacks libcurl may invoke into no-ops when
+ // we detect we're finalizing. The data structures are owned by this object and
+ // not by the callbacks, and will be destroyed below. Note that
+ // e.g. g_hash_table_unref() may itself invoke callbacks, which is where
+ // some data is cleaned up.
+ self->finalizing = true;
curl_multi_cleanup (self->multi);
g_free (self->remote_name);
g_free (self->tls_ca_db_path);
@@ -528,6 +538,10 @@ sock_cb (CURL *easy, curl_socket_t s, int what, void *cbp, void *sockp)
OstreeFetcher *fetcher = cbp;
SockInfo *fdp = (SockInfo *)sockp;

+ // We do nothing if we're in the process of teardown; see below.
+ if (fetcher->finalizing)
+ return 0;
+
if (what == CURL_POLL_REMOVE)
{
if (!g_hash_table_remove (fetcher->sockets, fdp))
1 change: 1 addition & 0 deletions recipes-extended/ostree/ostree_%.bbappend
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ SRC_URI:append = " \
file://0001-update-default-grub-cfg-header.patch \
file://0002-Add-support-for-the-fdtfile-variable-in-uEnv.txt.patch \
file://0003-ostree-fetcher-curl-set-max-parallel-connections.patch \
file://0004-curl-Make-socket-callback-during-cleanup-into-no-op.patch \
file://ostree-pending-reboot.service \
file://ostree-pending-reboot.path \
"

0 comments on commit 8e61a33

Please sign in to comment.