3aa2e0d8ed
* Tue Jun 14 2022 Arjun Shankar <arjun@redhat.com> - 2.34-38
- Sync with upstream branch release/2.34/master,
commit 94ab2088c37d8e4285354af120b7ed6b887b9e53:
- nss: handle stat failure in check_reload_and_get (BZ #28752)
- nss: add assert to DB_LOOKUP_FCT (BZ #28752)
- nios2: Remove _dl_skip_args usage (BZ# 29187)
- hppa: Remove _dl_skip_args usage (BZ# 29165)
- nptl: Fix __libc_cleanup_pop_restore asynchronous restore (BZ#29214)
Related: #2091541
Related: #2080163 (actually fixed in 601650f878, two commits ago)
75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
commit 94ab2088c37d8e4285354af120b7ed6b887b9e53
|
|
Author: Sam James <sam@gentoo.org>
|
|
Date: Sun Jun 5 04:57:10 2022 +0100
|
|
|
|
nss: handle stat failure in check_reload_and_get (BZ #28752)
|
|
|
|
Skip the chroot test if the database isn't loaded
|
|
correctly (because the chroot test uses some
|
|
existing DB state).
|
|
|
|
The __stat64_time64 -> fstatat call can fail if
|
|
running under an (aggressive) seccomp filter,
|
|
like Firefox seems to use.
|
|
|
|
This manifested in a crash when using glib built
|
|
with FAM support with such a Firefox build.
|
|
|
|
Suggested-by: DJ Delorie <dj@redhat.com>
|
|
Signed-off-by: Sam James <sam@gentoo.org>
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
(cherry picked from commit ace9e3edbca62d978b1e8f392d8a5d78500272d9)
|
|
|
|
diff --git a/nss/nss_database.c b/nss/nss_database.c
|
|
index 54561f03287db2e4..e807e9d84ca03680 100644
|
|
--- a/nss/nss_database.c
|
|
+++ b/nss/nss_database.c
|
|
@@ -420,23 +420,32 @@ nss_database_check_reload_and_get (struct nss_database_state *local,
|
|
return true;
|
|
}
|
|
|
|
- /* Before we reload, verify that "/" hasn't changed. We assume that
|
|
- 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)))
|
|
+ int stat_rv = __stat64_time64 ("/", &str);
|
|
+
|
|
+ if (local->data.services[database_index] != NULL)
|
|
{
|
|
- /* Change detected; disable reloading and return current state. */
|
|
- atomic_store_release (&local->data.reload_disabled, 1);
|
|
- *result = local->data.services[database_index];
|
|
- __libc_lock_unlock (local->lock);
|
|
- return true;
|
|
+ /* Before we reload, verify that "/" hasn't changed. We assume that
|
|
+ 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 (stat_rv != 0
|
|
+ || (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);
|
|
+ *result = local->data.services[database_index];
|
|
+ __libc_lock_unlock (local->lock);
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ if (stat_rv == 0)
|
|
+ {
|
|
+ local->root_ino = str.st_ino;
|
|
+ local->root_dev = str.st_dev;
|
|
}
|
|
- local->root_ino = str.st_ino;
|
|
- local->root_dev = str.st_dev;
|
|
+
|
|
__libc_lock_unlock (local->lock);
|
|
|
|
/* Avoid overwriting the global configuration until we have loaded
|