| 1 |
commit: dc60b86d63c8bd0421ccace84f8ae2929c790074 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 04:01:43 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 04:01:43 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=dc60b86d |
| 7 |
|
| 8 |
Chromium sandbox related fixes not needed anymore, upstreamed |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
...ault-in-getpwuid-when-stat-fails-BZ-28752.patch | 38 ---------------------- |
| 13 |
...0014-Drop-glibc-lock-when-returning-early.patch | 36 -------------------- |
| 14 |
2 files changed, 74 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 32fd8a6..0000000 |
| 19 |
--- a/9999/0013-Fix-segfault-in-getpwuid-when-stat-fails-BZ-28752.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,38 +0,0 @@ |
| 22 |
-From ce54d71af85a735b3ddf29bde1f6ee6e0844d352 Mon Sep 17 00:00:00 2001 |
| 23 |
-From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
| 24 |
-Date: Sat, 12 Feb 2022 19:40:58 +0100 |
| 25 |
-Subject: [PATCH 13/14] Fix segfault in getpwuid when stat fails (BZ #28752) |
| 26 |
- |
| 27 |
-[azanella proposed this patch to sam when discussing the issue, |
| 28 |
- but it's not anywhere upstream yet- dilfridge] |
| 29 |
- |
| 30 |
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28752 |
| 31 |
-Bug: https://bugs.gentoo.org/828070 |
| 32 |
-(cherry picked from commit 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b) |
| 33 |
---- |
| 34 |
- nss/nss_database.c | 9 +++++---- |
| 35 |
- 1 file changed, 5 insertions(+), 4 deletions(-) |
| 36 |
- |
| 37 |
-diff --git a/nss/nss_database.c b/nss/nss_database.c |
| 38 |
-index d56c5b798d..133682b858 100644 |
| 39 |
---- a/nss/nss_database.c |
| 40 |
-+++ b/nss/nss_database.c |
| 41 |
-@@ -424,10 +424,11 @@ nss_database_check_reload_and_get (struct nss_database_state *local, |
| 42 |
- errors here are very unlikely, but the chance that we're entering |
| 43 |
- a container is also very unlikely, so we err on the side of both |
| 44 |
- very unlikely things not happening at the same time. */ |
| 45 |
-- if (__stat64_time64 ("/", &str) != 0 |
| 46 |
-- || (local->root_ino != 0 |
| 47 |
-- && (str.st_ino != local->root_ino |
| 48 |
-- || str.st_dev != local->root_dev))) |
| 49 |
-+ if (__stat64_time64 ("/", &str) != 0) |
| 50 |
-+ return false; |
| 51 |
-+ |
| 52 |
-+ if (local->root_ino != 0 && (str.st_ino != local->root_ino |
| 53 |
-+ || str.st_dev != local->root_dev)) |
| 54 |
- { |
| 55 |
- /* Change detected; disable reloading and return current state. */ |
| 56 |
- atomic_store_release (&local->data.reload_disabled, 1); |
| 57 |
--- |
| 58 |
-2.35.1 |
| 59 |
- |
| 60 |
|
| 61 |
diff --git a/9999/0014-Drop-glibc-lock-when-returning-early.patch b/9999/0014-Drop-glibc-lock-when-returning-early.patch |
| 62 |
deleted file mode 100644 |
| 63 |
index ccb544e..0000000 |
| 64 |
--- a/9999/0014-Drop-glibc-lock-when-returning-early.patch |
| 65 |
+++ /dev/null |
| 66 |
@@ -1,36 +0,0 @@ |
| 67 |
-From f0967c21f82d9b6db6faa41315f668f56e38562f Mon Sep 17 00:00:00 2001 |
| 68 |
-From: Sam James <sam@g.o> |
| 69 |
-Date: Mon, 7 Mar 2022 01:59:53 +0100 |
| 70 |
-Subject: [PATCH 14/14] Drop glibc lock when returning early |
| 71 |
-MIME-Version: 1.0 |
| 72 |
-Content-Type: text/plain; charset=UTF-8 |
| 73 |
-Content-Transfer-Encoding: 8bit |
| 74 |
- |
| 75 |
-Fixes 1bcdcd4fec9bfe2f1d3fef67a43825903f6a5f2b |
| 76 |
- |
| 77 |
-Bug: https://bugs.gentoo.org/828070 |
| 78 |
-Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
| 79 |
-(cherry picked from commit 81f6a812264e375a695e5b00e2906da8102cc9b6) |
| 80 |
---- |
| 81 |
- nss/nss_database.c | 4 +++- |
| 82 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
| 83 |
- |
| 84 |
-diff --git a/nss/nss_database.c b/nss/nss_database.c |
| 85 |
-index 133682b858..5f58baf34b 100644 |
| 86 |
---- a/nss/nss_database.c |
| 87 |
-+++ b/nss/nss_database.c |
| 88 |
-@@ -424,8 +424,10 @@ nss_database_check_reload_and_get (struct nss_database_state *local, |
| 89 |
- errors here are very unlikely, but the chance that we're entering |
| 90 |
- a container is also very unlikely, so we err on the side of both |
| 91 |
- very unlikely things not happening at the same time. */ |
| 92 |
-- if (__stat64_time64 ("/", &str) != 0) |
| 93 |
-+ if (__stat64_time64 ("/", &str) != 0) { |
| 94 |
-+ __libc_lock_unlock (local->lock); |
| 95 |
- return false; |
| 96 |
-+ } |
| 97 |
- |
| 98 |
- if (local->root_ino != 0 && (str.st_ino != local->root_ino |
| 99 |
- || str.st_dev != local->root_dev)) |
| 100 |
--- |
| 101 |
-2.35.1 |
| 102 |
- |
Archives