commit: dc60b86d63c8bd0421ccace84f8ae2929c790074 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Jul 5 04:01:43 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jul 5 04:01:43 2022 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=dc60b86d
Chromium sandbox related fixes not needed anymore, upstreamed Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> ...ault-in-getpwuid-when-stat-fails-BZ-28752.patch | 38 ---------------------- ...0014-Drop-glibc-lock-when-returning-early.patch | 36 -------------------- 2 files changed, 74 deletions(-) diff --git a/9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch b/9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch deleted file mode 100644 index 32fd8a6..0000000 --- a/9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ce54d71af85a735b3ddf29bde1f6ee6e0844d352 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella <[email protected]> -Date: Sat, 12 Feb 2022 19:40:58 +0100 -Subject: [PATCH 13/14] Fix segfault in getpwuid when stat fails (BZ #28752) - -[azanella proposed this patch to sam when discussing the issue, - but it's not anywhere upstream yet- dilfridge] - -Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28752 -Bug: https://bugs.gentoo.org/828070 -(cherry picked from commit 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b) ---- - nss/nss_database.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/nss/nss_database.c b/nss/nss_database.c -index d56c5b798d..133682b858 100644 ---- a/nss/nss_database.c -+++ b/nss/nss_database.c -@@ -424,10 +424,11 @@ 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 -- || (local->root_ino != 0 -- && (str.st_ino != local->root_ino -- || str.st_dev != local->root_dev))) -+ if (__stat64_time64 ("/", &str) != 0) -+ return false; -+ -+ if (local->root_ino != 0 && (str.st_ino != local->root_ino -+ || str.st_dev != local->root_dev)) - { - /* Change detected; disable reloading and return current state. */ - atomic_store_release (&local->data.reload_disabled, 1); --- -2.35.1 - diff --git a/9999/0014-Drop-glibc-lock-when-returning-early.patch b/9999/0014-Drop-glibc-lock-when-returning-early.patch deleted file mode 100644 index ccb544e..0000000 --- a/9999/0014-Drop-glibc-lock-when-returning-early.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f0967c21f82d9b6db6faa41315f668f56e38562f Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Mon, 7 Mar 2022 01:59:53 +0100 -Subject: [PATCH 14/14] 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 <[email protected]> -(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.35.1 -
