From owner-freebsd-desktop@freebsd.org Thu Oct 15 17:16:15 2020 Return-Path: Delivered-To: freebsd-desktop@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 952BC44337E for ; Thu, 15 Oct 2020 17:16:15 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CBwt73WZrz3TjW for ; Thu, 15 Oct 2020 17:16:15 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 76D4D44337D; Thu, 15 Oct 2020 17:16:15 +0000 (UTC) Delivered-To: desktop@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7697E4431D2 for ; Thu, 15 Oct 2020 17:16:15 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CBwt72ZFwz3TjV for ; Thu, 15 Oct 2020 17:16:15 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3870F22C3A for ; Thu, 15 Oct 2020 17:16:15 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 09FHGFan019710 for ; Thu, 15 Oct 2020 17:16:15 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 09FHGFl8019709 for desktop@FreeBSD.org; Thu, 15 Oct 2020 17:16:15 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: desktop@FreeBSD.org Subject: [Bug 250311] devel/glib20: lock getfsent() usage to fix x11-fm/thunar crashes Date: Thu, 15 Oct 2020 17:16:15 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: needs-qa X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: sigsys@gmail.com X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: fluffy@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-desktop@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Using and improving FreeBSD on the desktop List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2020 17:16:15 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D250311 --- Comment #3 from sigsys@gmail.com --- (In reply to Tijl Coosemans from comment #2) Oops you're right. Better to move the call down while at it? No need to protect the sysctls. --- gio/gunixmounts.c.orig 2020-10-01 09:17:53.138733000 -0400 +++ gio/gunixmounts.c 2020-10-15 13:05:40.628175000 -0400 @@ -1389,6 +1389,8 @@ #elif (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) +G_LOCK_DEFINE_STATIC(getfsent); + static GList * _g_get_unix_mount_points (void) { @@ -1400,9 +1402,6 @@ struct stat sb; #endif - if (!setfsent ()) - return NULL; - return_list =3D NULL; #ifdef HAVE_SYS_SYSCTL_H @@ -1433,6 +1432,11 @@ #endif #endif + G_LOCK (getfsent); + if (!setfsent ()) { + G_UNLOCK (getfsent); + return NULL; + } while ((fstab =3D getfsent ()) !=3D NULL) { gboolean is_read_only =3D FALSE; @@ -1468,6 +1472,7 @@ } endfsent (); + G_UNLOCK (getfsent); return g_list_reverse (return_list); } --=20 You are receiving this mail because: You are on the CC list for the bug.=