luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gunixmounts: Use fallback if libmount monitoring fails

Browse Source 
The recently added libmount-based unix mount monitoring may fail when the
device exceeds inotify limits. Let's fallback to the older implementation
in case of the `mnt_monitor_get_fd` function failure. This among others
fixes tracker-miners failures caused by seccomp rules.

Fixes: https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/315
This commit is contained in:
Ondrej Holy 2024-04-19 09:54:50 +02:00
parent 81eaabb308
commit dbb7a12a96
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gio/gunixmounts.c
View File

@ -155,7 +155,7 @@ G_LOCK_DEFINE_STATIC (proc_mounts_source);
/* Protected by proc_mounts_source lock */ /* Protected by proc_mounts_source lock */
static guint64 mount_poller_time = 0; static guint64 mount_poller_time = 0;
static GSource *proc_mounts_watch_source; static GSource *proc_mounts_watch_source = NULL;
#ifdef HAVE_SYS_MNTTAB_H #ifdef HAVE_SYS_MNTTAB_H
#define MNTOPT_RO "ro" #define MNTOPT_RO "ro"
@ -1921,11 +1921,10 @@ proc_mounts_changed (GIOChannel *channel,
} }
G_UNLOCK (proc_mounts_source); G_UNLOCK (proc_mounts_source);
} }
#endif
#else
if (cond & G_IO_ERR) if (cond & G_IO_ERR)
has_changed = TRUE; has_changed = TRUE;
#endif
if (has_changed) if (has_changed)
{ {
@ -2066,14 +2065,20 @@ mount_monitor_start (void)
} }
else else
{ {
g_set_error_literal (&error, G_IO_ERROR, g_io_error_from_errno (-ret), g_debug ("mnt_monitor_get_fd failed: %s", g_strerror (-ret));
g_strerror (-ret)); g_clear_pointer (&proc_mounts_monitor, mnt_unref_monitor);
/* The mnt_monitor_get_fd function failed e.g. inotify limits are
* exceeded. Let's try to silently fallback to the old behavior.
* See: https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/315
*/
} }
G_UNLOCK (proc_mounts_source); G_UNLOCK (proc_mounts_source);
#else
proc_mounts_channel = g_io_channel_new_file (mtab_path, "r", &error);
#endif #endif
if (proc_mounts_channel == NULL)
proc_mounts_channel = g_io_channel_new_file (mtab_path, "r", &error);
if (proc_mounts_channel == NULL) if (proc_mounts_channel == NULL)
{ {
g_warning ("Error creating IO channel for %s: %s (%s, %d)", mtab_path, g_warning ("Error creating IO channel for %s: %s (%s, %d)", mtab_path,
@ -2085,10 +2090,12 @@ mount_monitor_start (void)
G_LOCK (proc_mounts_source); G_LOCK (proc_mounts_source);
#ifdef HAVE_LIBMOUNT #ifdef HAVE_LIBMOUNT
proc_mounts_watch_source = g_io_create_watch (proc_mounts_channel, G_IO_IN); if (proc_mounts_monitor != NULL)
#else proc_mounts_watch_source = g_io_create_watch (proc_mounts_channel, G_IO_IN);
proc_mounts_watch_source = g_io_create_watch (proc_mounts_channel, G_IO_ERR);
#endif #endif
if (proc_mounts_watch_source == NULL)
proc_mounts_watch_source = g_io_create_watch (proc_mounts_channel, G_IO_ERR);
mount_poller_time = (guint64) g_get_monotonic_time (); mount_poller_time = (guint64) g_get_monotonic_time ();
g_source_set_callback (proc_mounts_watch_source, g_source_set_callback (proc_mounts_watch_source,
(GSourceFunc) proc_mounts_changed, (GSourceFunc) proc_mounts_changed,