Resolves: #RHEL-131656
This commit is contained in:
Joseph Marrero Corchado
parent
a7ff109114
commit
63df44d762
150
0001-state-overlay-Fix-ENODATA-handling-for-GLib-2.74.patch
Normal file
150
0001-state-overlay-Fix-ENODATA-handling-for-GLib-2.74.patch
Normal file
@ -0,0 +1,150 @@
|
||||
From a56255cbc09f3ac01d67bcee8b355ceebc7f2d47 Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Marrero Corchado <jmarrero@redhat.com>
|
||||
Date: Tue, 16 Dec 2025 14:30:47 -0500
|
||||
Subject: [PATCH] state-overlay: Fix ENODATA handling for GLib < 2.74
|
||||
|
||||
The state overlay feature fails on first boot with:
|
||||
|
||||
error: lgetxattr(user.ostree.deploymentcsum): No data available
|
||||
|
||||
This happens because `lgetxattrat_allow_noent()` checks for
|
||||
`G_IO_ERROR_INVALID_DATA` to detect when an xattr doesn't exist.
|
||||
However, GLib's `g_io_error_from_errno()` only maps `ENODATA` to
|
||||
`G_IO_ERROR_INVALID_DATA` since GLib 2.74. Older versions (such as
|
||||
GLib 2.68 shipped in CentOS Stream 9) return `G_IO_ERROR_FAILED`
|
||||
instead, causing the check to fail and the error to propagate.
|
||||
|
||||
This creates a chicken-and-egg problem: the code tries to read the
|
||||
`user.ostree.deploymentcsum` xattr before it can set it, but the read
|
||||
fails on fresh overlay directories where the xattr hasn't been set yet.
|
||||
|
||||
Fix this by checking `errno == ENODATA` directly after the failed call,
|
||||
which is portable across all GLib versions. Also rename the function
|
||||
from `lgetxattrat_allow_noent` to `lgetxattrat_allow_nodata` to more
|
||||
accurately reflect its purpose (ENODATA vs ENOENT).
|
||||
|
||||
This bug has existed since the state overlay feature was introduced in
|
||||
v2024.1 but was masked on systems with GLib >= 2.74 (e.g., Fedora,
|
||||
CentOS Stream 10) where the mapping happens to exist.
|
||||
|
||||
Assisted-by: Claude Code (Opus 4.5)
|
||||
|
||||
Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
|
||||
---
|
||||
src/ostree/ot-admin-builtin-state-overlay.c | 75 +++++++++++++++++----
|
||||
1 file changed, 62 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/ostree/ot-admin-builtin-state-overlay.c b/src/ostree/ot-admin-builtin-state-overlay.c
|
||||
index 7bf386c4..3c763ae0 100644
|
||||
--- a/src/ostree/ot-admin-builtin-state-overlay.c
|
||||
+++ b/src/ostree/ot-admin-builtin-state-overlay.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sched.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/mount.h>
|
||||
+#include <sys/xattr.h>
|
||||
|
||||
#include "glnx-errors.h"
|
||||
#include "glnx-fdio.h"
|
||||
@@ -62,20 +63,68 @@ ensure_overlay_dirs (const char *overlay_dir, int *out_overlay_dfd, GCancellable
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-/* XXX: upstream to libglnx */
|
||||
+/* Based on glnx_lgetxattrat() from libglnx, modified to treat ENODATA
|
||||
+ * (xattr not set) as success with *out_bytes = NULL. We check errno
|
||||
+ * immediately after the lgetxattr syscall, before any GLib calls can
|
||||
+ * clobber it. This avoids depending on GLib's g_io_error_from_errno()
|
||||
+ * mapping, which only maps ENODATA to G_IO_ERROR_NOT_FOUND since GLib 2.74.
|
||||
+ *
|
||||
+ * This implementation handles the TOCTOU race condition where the xattr size
|
||||
+ * may change between the size query and the data read by retrying with ERANGE.
|
||||
+ * It also handles the case where the xattr is deleted between calls (ENODATA
|
||||
+ * on second call). Zero-length xattrs are handled without allocating a buffer.
|
||||
+ *
|
||||
+ * TODO: Upstream to libglnx. */
|
||||
static gboolean
|
||||
-lgetxattrat_allow_noent (int dfd, const char *path, const char *attribute, GBytes **out_bytes,
|
||||
- GError **error)
|
||||
+lgetxattrat_allow_nodata (int dfd, const char *path, const char *attribute, GBytes **out_bytes,
|
||||
+ GError **error)
|
||||
{
|
||||
- g_autoptr (GError) local_error = NULL;
|
||||
- *out_bytes = glnx_lgetxattrat (dfd, path, attribute, &local_error);
|
||||
- if (!*out_bytes)
|
||||
+ char pathbuf[PATH_MAX];
|
||||
+ int n = snprintf (pathbuf, sizeof (pathbuf), "/proc/self/fd/%d/%s", dfd, path);
|
||||
+ if (n < 0 || n >= sizeof (pathbuf))
|
||||
+ return glnx_throw (error, "Path truncated for fd %d, path %s", dfd, path);
|
||||
+
|
||||
+ ssize_t bytes_read;
|
||||
+ ssize_t real_size;
|
||||
+ g_autofree guint8 *buf = NULL;
|
||||
+
|
||||
+again:
|
||||
+ errno = 0;
|
||||
+ bytes_read = TEMP_FAILURE_RETRY (lgetxattr (pathbuf, attribute, NULL, 0));
|
||||
+ if (bytes_read < 0)
|
||||
+ {
|
||||
+ if (errno == ENODATA)
|
||||
+ {
|
||||
+ *out_bytes = NULL;
|
||||
+ return TRUE; /* xattr not set; that's fine */
|
||||
+ }
|
||||
+ return glnx_throw_errno_prefix (error, "lgetxattr(%s)", attribute);
|
||||
+ }
|
||||
+
|
||||
+ if (bytes_read == 0)
|
||||
{
|
||||
- if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA))
|
||||
- return TRUE;
|
||||
- g_propagate_error (error, g_steal_pointer (&local_error));
|
||||
- return FALSE;
|
||||
+ *out_bytes = g_bytes_new_static ("", 0);
|
||||
+ return TRUE;
|
||||
}
|
||||
+
|
||||
+ buf = g_malloc (bytes_read);
|
||||
+ real_size = TEMP_FAILURE_RETRY (lgetxattr (pathbuf, attribute, buf, bytes_read));
|
||||
+ if (real_size < 0)
|
||||
+ {
|
||||
+ if (errno == ERANGE)
|
||||
+ {
|
||||
+ g_clear_pointer (&buf, g_free);
|
||||
+ goto again;
|
||||
+ }
|
||||
+ if (errno == ENODATA)
|
||||
+ {
|
||||
+ *out_bytes = NULL;
|
||||
+ return TRUE; /* xattr was deleted between calls */
|
||||
+ }
|
||||
+ return glnx_throw_errno_prefix (error, "lgetxattr(%s)", attribute);
|
||||
+ }
|
||||
+
|
||||
+ *out_bytes = g_bytes_new_take (g_steal_pointer (&buf), real_size);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -83,7 +132,7 @@ static gboolean
|
||||
is_opaque_dir (int dfd, const char *dname, gboolean *out_is_opaque, GError **error)
|
||||
{
|
||||
g_autoptr (GBytes) data = NULL;
|
||||
- if (!lgetxattrat_allow_noent (dfd, dname, OVERLAYFS_DIR_XATTR_OPAQUE, &data, error))
|
||||
+ if (!lgetxattrat_allow_nodata (dfd, dname, OVERLAYFS_DIR_XATTR_OPAQUE, &data, error))
|
||||
return FALSE;
|
||||
|
||||
if (!data)
|
||||
@@ -203,8 +252,8 @@ get_overlay_deployment_checksum (int overlay_dfd, char **out_checksum, GCancella
|
||||
GError **error)
|
||||
{
|
||||
g_autoptr (GBytes) bytes = NULL;
|
||||
- if (!lgetxattrat_allow_noent (overlay_dfd, OSTREE_STATEOVERLAY_UPPER_DIR,
|
||||
- OSTREE_STATEOVERLAY_XATTR_DEPLOYMENT_CSUM, &bytes, error))
|
||||
+ if (!lgetxattrat_allow_nodata (overlay_dfd, OSTREE_STATEOVERLAY_UPPER_DIR,
|
||||
+ OSTREE_STATEOVERLAY_XATTR_DEPLOYMENT_CSUM, &bytes, error))
|
||||
return FALSE;
|
||||
if (!bytes)
|
||||
return TRUE; /* probably newly created */
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@ -8,11 +8,13 @@
|
||||
Summary: Tool for managing bootable, immutable filesystem trees
|
||||
Name: ostree
|
||||
Version: 2025.6
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
|
||||
Source1: ostree-readonly-sysroot-migration
|
||||
Source2: ostree-readonly-sysroot-migration.service
|
||||
|
||||
Patch0: 0001-state-overlay-Fix-ENODATA-handling-for-GLib-2.74.patch
|
||||
|
||||
License: LGPLv2+
|
||||
URL: https://ostree.readthedocs.io/en/latest/
|
||||
|
||||
@ -179,6 +181,10 @@ find %{buildroot} -name '*.la' -delete
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 21 2026 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.6-3
|
||||
- Backport https://github.com/ostreedev/ostree/pull/3555
|
||||
Resolves: #RHEL-131656
|
||||
|
||||
* Fri Sep 05 2025 Colin Walters <walters@verbum.org> - 2025.6-2
|
||||
- Update to 2025.6
|
||||
Resolves: #RHEL-113644
|
||||
|
||||
Loading…
Reference in New Issue
Block a user