| Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 1 | From e4e88688a0722237effc56cc21438d0c8e82de88 Mon Sep 17 00:00:00 2001 |
| 2 | From: Philip Withnall <pwithnall@endlessos.org> |
| 3 | Date: Wed, 11 Nov 2020 18:29:26 +0000 |
| 4 | Subject: [PATCH 10/29] kqueue: Fix unlocked access to shared variable |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | And drop the `volatile` qualifier because it doesn’t help. |
| 10 | |
| 11 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> |
| 12 | |
| 13 | Helps: #600 |
| 14 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] |
| 15 | --- |
| 16 | gio/kqueue/kqueue-missing.c | 5 +++-- |
| 17 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 18 | |
| 19 | diff --git a/gio/kqueue/kqueue-missing.c b/gio/kqueue/kqueue-missing.c |
| 20 | index 37af82e5b..d1ffdf4bd 100644 |
| 21 | --- a/gio/kqueue/kqueue-missing.c |
| 22 | +++ b/gio/kqueue/kqueue-missing.c |
| 23 | @@ -34,7 +34,7 @@ static gboolean km_debug_enabled = FALSE; |
| 24 | static GSList *missing_subs_list = NULL; |
| 25 | G_LOCK_DEFINE_STATIC (missing_lock); |
| 26 | |
| 27 | -static volatile gboolean scan_missing_running = FALSE; |
| 28 | +static gboolean scan_missing_running = FALSE; /* must be accessed under @missing_lock */ |
| 29 | |
| 30 | |
| 31 | static gboolean |
| 32 | @@ -62,7 +62,6 @@ _km_add_missing (kqueue_sub *sub) |
| 33 | |
| 34 | KM_W ("adding %s to missing list\n", sub->filename); |
| 35 | missing_subs_list = g_slist_prepend (missing_subs_list, sub); |
| 36 | - G_UNLOCK (missing_lock); |
| 37 | |
| 38 | if (!scan_missing_running) |
| 39 | { |
| 40 | @@ -73,6 +72,8 @@ _km_add_missing (kqueue_sub *sub) |
| 41 | g_source_attach (source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); |
| 42 | g_source_unref (source); |
| 43 | } |
| 44 | + |
| 45 | + G_UNLOCK (missing_lock); |
| 46 | } |
| 47 | |
| 48 | /** |
| 49 | -- |
| 50 | 2.30.1 |
| 51 | |