From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AFDE15808B for ; Mon, 7 Mar 2022 01:04:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59A71E0A43; Mon, 7 Mar 2022 01:04:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C564FE0A43 for ; Mon, 7 Mar 2022 01:04:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A54203432B5 for ; Mon, 7 Mar 2022 01:04:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08F9726D for ; Mon, 7 Mar 2022 01:04:28 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1646615026.6002612f230d2b8d88fefba6c6477a20e77efc23.dilfridge@gentoo> Subject: [gentoo-commits] proj/toolchain/glibc-patches:master commit in: 9999/ X-VCS-Repository: proj/toolchain/glibc-patches X-VCS-Files: 9999/0302-Drop-glibc-lock-when-returning-early.patch X-VCS-Directories: 9999/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 6002612f230d2b8d88fefba6c6477a20e77efc23 X-VCS-Branch: master Date: Mon, 7 Mar 2022 01:04:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f2ced3d-b0c7-4f1b-adcb-423e0c287418 X-Archives-Hash: 26dab3ab703bfe4634d92a28b5dfa33d commit: 6002612f230d2b8d88fefba6c6477a20e77efc23 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Mar 7 01:03:46 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Mar 7 01:03:46 2022 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=6002612f Additional fixup for the glibc/firefox/seccomp interaction Bug: https://bugs.gentoo.org/828070 Signed-off-by: Andreas K. Hüttel gentoo.org> ...0302-Drop-glibc-lock-when-returning-early.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/9999/0302-Drop-glibc-lock-when-returning-early.patch b/9999/0302-Drop-glibc-lock-when-returning-early.patch new file mode 100644 index 0000000..4eab4ea --- /dev/null +++ b/9999/0302-Drop-glibc-lock-when-returning-early.patch @@ -0,0 +1,36 @@ +From fd939e8740a97b3ffc5816cebb7be947c7b560af Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 7 Mar 2022 01:59:53 +0100 +Subject: [PATCH] Drop glibc lock when returning early +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b + +Bug: https://bugs.gentoo.org/828070 +Signed-off-by: Andreas K. Hüttel +(cherry picked from commit 81f6a812264e375a695e5b00e2906da8102cc9b6) +--- + nss/nss_database.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/nss/nss_database.c b/nss/nss_database.c +index 133682b858..5f58baf34b 100644 +--- a/nss/nss_database.c ++++ b/nss/nss_database.c +@@ -424,8 +424,10 @@ nss_database_check_reload_and_get (struct nss_database_state *local, + errors here are very unlikely, but the chance that we're entering + a container is also very unlikely, so we err on the side of both + very unlikely things not happening at the same time. */ +- if (__stat64_time64 ("/", &str) != 0) ++ if (__stat64_time64 ("/", &str) != 0) { ++ __libc_lock_unlock (local->lock); + return false; ++ } + + if (local->root_ino != 0 && (str.st_ino != local->root_ino + || str.st_dev != local->root_dev)) +-- +2.34.1 +