Skip to contentSkip to conversation

package/e2fsprogs: fix fsverity build error slightly differently

PATCH In review Markus Mayer via buildroot 1 participant 3 messages Dec 5, 2025 – Feb 2

lore
Share & tools
lore
#0 lore raw

cover package/e2fsprogs: fix fsverity build error slightly differently

This is the follow-up to the mailing list discussion at [1].

The only thing I undid about Thomas' patch was to remove 0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch

The change to e2fsprogs.mk remains with the comment slightly tweaked.

Please feel free to adjust the commit message if needed.

[1]: https://lists.buildroot.org/pipermail/buildroot/2025-November/790482.html

Markus Mayer (1):
package/e2fsprogs: fix fsverity build error slightly differently

 ...ck-for-FS_IOC_READ_VERITY_METADATA-a.patch | 103 --------------
 .../0001-lib-add-kern_compat.h.patch          | 134 ++++++++++++++++++
 package/e2fsprogs/0002-Generated-files.patch  |  63 ++++++++
 package/e2fsprogs/e2fsprogs.mk                |   4 +-
 4 files changed, 199 insertions(+), 105 deletions(-)
 delete mode 100644 package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch
 create mode 100644 package/e2fsprogs/0001-lib-add-kern_compat.h.patch
 create mode 100644 package/e2fsprogs/0002-Generated-files.patch
Signature · 6 lines
2.51.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/1 package/e2fsprogs: fix fsverity build error slightly differently

Turns out Thomas and I were working concurrently on two different ways to fix the e2fsprogs 1.47.3 build error with regards to fsverity not being present in older kernels.

Thomas' patch disables the fsverity functionality in e2fsprogs based on the kernel headers used for compilation while my patch aims to provide the missing definitions if the kernel doesn't.

By providing the missing definitions whenever the kernel headers don't, fsverity related features can be compiled in even if the kernel headers are too old. This allows binaries to run on newer kernels with full functionality, but it relies on e2fsprogs to properly handle -ENOTSUPP errors at runtime if the kernel doesn't support the ioctl.[1]

We both submitted our respective patches to Ted T'so but haven't heard back as of yet. After a brief discussion on the Buildroot mailing list, we are trying my approach for now.

[1]: Compiling binaries against older kernel headers, but exclusively running them on newer kernels, can happen if one's toolchain comes with older kernel headers in the sysroot for increased compatibility across multiple kernel versions (e.g. the same toolchain & sysroot are used to build root file systems with Linux 5.4 and 6.12).

---
 ...ck-for-FS_IOC_READ_VERITY_METADATA-a.patch | 103 --------------
 .../0001-lib-add-kern_compat.h.patch          | 134 ++++++++++++++++++
 package/e2fsprogs/0002-Generated-files.patch  |  63 ++++++++
 package/e2fsprogs/e2fsprogs.mk                |   4 +-
 4 files changed, 199 insertions(+), 105 deletions(-)
 delete mode 100644 package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch
 create mode 100644 package/e2fsprogs/0001-lib-add-kern_compat.h.patch
 create mode 100644 package/e2fsprogs/0002-Generated-files.patch
package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch deleted +0 -103
deleted file mode 100644
index 36442a53b81e..000000000000
@@ -1,103 +0,0 @@
-From 1a2ce8cd956065106ae27a36a5000f00ebc4591f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sat, 22 Nov 2025 21:12:23 +0100
-Subject: [PATCH] configure.ac: check for FS_IOC_READ_VERITY_METADATA
- availability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 6bfa843b4435334ac073e42950b48d8bacb54977 ("mke2fs: enable
-copying of fs-verity metadata") introduced support for reading
-fs-verity metadata, which requires using the
-FS_IOC_READ_VERITY_METADATA.
-
-The code is conditionally compiled when the kernel headers have
-<linux/fsverity.h> available. Unfortunately, this check is not
-sufficient: <linux/fsverity.h> was introduced in Linux 5.10, but the
-FS_IOC_READ_VERITY_METADATA was not introduced before 5.12, so if one
-is using 5.10 or 5.11 kernel headers, the build fails with:
-
-./../misc/create_inode.c: In function ‘copy_fs_verity_data’:
-./../misc/create_inode.c:589:10: error: variable ‘arg’ has initializer but incomplete type
-  589 |   struct fsverity_read_metadata_arg arg = {
-      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~
-[...]
-./../misc/create_inode.c:600:20: error: ‘FS_IOC_READ_VERITY_METADATA’ undeclared (first use in this function)
-  600 |   size = ioctl(fd, FS_IOC_READ_VERITY_METADATA, &arg);
-      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This commit therefore extends the configure.ac check to ensure that
-not only <linux/fsverity.h> exists but also that it defines the
-FS_IOC_READ_VERITY_METADATA ioctl.
-
-Upstream: https://github.com/tytso/e2fsprogs/pull/256
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- configure.ac        | 18 ++++++++++++++++++
- misc/create_inode.c |  6 +++---
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a0171163..3e5586a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1997,6 +1997,24 @@ OS_IO_FILE=""
- esac]
- AC_SUBST(OS_IO_FILE)
- 
-+dnl Check for fsverity ioctl
-+if test "${ac_cv_header_linux_fsverity_h}" = "yes"; then
-+   AC_MSG_CHECKING([for FS_IOC_READ_VERITY_METADATA ioctl])
-+   AC_PREPROC_IFELSE(
-+   [AC_LANG_PROGRAM([[
-+#include <linux/fsverity.h>
-+#ifndef FS_IOC_READ_VERITY_METADATA
-+# error "FS_IOC_READ_VERITY_METADATA not available"
-+#endif
-+]], [])], [
-+   AC_DEFINE([HAVE_FS_IOC_READ_VERITY_METADATA], [1], [Define to 1 if FS_IOC_READ_VERITY_METADATA ioctl is available])
-+   AC_MSG_RESULT([yes])
-+   ],
-+   [
-+   AC_MSG_RESULT([no])
-+   ])
-+fi
-+
- dnl
- dnl Make our output files, being sure that we create the some miscellaneous 
- dnl directories
-diff --git a/misc/create_inode.c b/misc/create_inode.c
-index 624efc03..a7918873 100644
---- a/misc/create_inode.c
-+++ b/misc/create_inode.c
-@@ -30,7 +30,7 @@
- #ifdef HAVE_SYS_SYSMACROS_H
- #include <sys/sysmacros.h>
- #endif
--#ifdef HAVE_LINUX_FSVERITY_H
-+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
- #include <linux/fsverity.h>
- #include <linux/fs.h>
- #endif
-@@ -569,7 +569,7 @@ out:
- }
- #endif /* FS_IOC_FIEMAP */
- 
--#ifdef HAVE_LINUX_FSVERITY_H
-+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
- static inline off_t round_up(off_t n, off_t blksz, off_t bias)
- {
-   return ((n - bias + (blksz - 1)) & ~(blksz - 1)) + bias;
-@@ -738,7 +738,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf,
- 		err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
- 				      zerobuf);
- 
--#ifdef HAVE_LINUX_FSVERITY_H
-+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
- 	if (!err && (flags & EXT4_VERITY_FL))
- 		err = copy_fs_verity(fs, fd, e2_file, statbuf->st_size);
- #endif
--- 
-2.51.1
-
package/e2fsprogs/0001-lib-add-kern_compat.h.patch new file +134 -0

134 lines not on this page · raw message

package/e2fsprogs/0002-Generated-files.patch new file +63 -0

63 lines not on this page · raw message

package/e2fsprogs/e2fsprogs.mk +2 -2
index ad3d1dbe75b3..276b84c75a00 100644
@@ -18,8 +18,8 @@ E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
 
-# 0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch
-# the additional dependencies are only needed for autoreconf
+# We have patches that require us to run autoreconf. The additional dependencies
+# are only needed for that.
 E2FSPROGS_AUTORECONF = YES
 E2FSPROGS_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
 E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive
Signature · 6 lines
2.51.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Hello Markus,

Quoted 18 lines · Markus Mayer via buildroot

Turns out Thomas and I were working concurrently on two different ways to fix the e2fsprogs 1.47.3 build error with regards to fsverity not being present in older kernels.

Thomas' patch disables the fsverity functionality in e2fsprogs based on the kernel headers used for compilation while my patch aims to provide the missing definitions if the kernel doesn't.

By providing the missing definitions whenever the kernel headers don't, fsverity related features can be compiled in even if the kernel headers are too old. This allows binaries to run on newer kernels with full functionality, but it relies on e2fsprogs to properly handle -ENOTSUPP errors at runtime if the kernel doesn't support the ioctl.[1]

We both submitted our respective patches to Ted T'so but haven't heard back as of yet. After a brief discussion on the Buildroot mailing list, we are trying my approach for now.

Quoted 7 lines

[1]: Compiling binaries against older kernel headers, but exclusively running them on newer kernels, can happen if one's toolchain comes with older kernel headers in the sysroot for increased compatibility across multiple kernel versions (e.g. the same toolchain & sysroot are used to build root file systems with Linux 5.4 and 6.12).

Since then, my patch has been accepted and merged by Ted Tso:

https://github.com/tytso/e2fsprogs/commit/4aba12dc19a95626eb7fa1df2d19c5235c2bc848

And it was integrated into Buildroot as well. Since we no longer have any build failure in Buildroot, I think to be convinced that another approach is needed, you should first convince upstream first that your approach is better. Therefore, I will mark your Buildroot patch as Rejected, but if you get your patches merged upstream, we will obviously be happy to backport them in Buildroot (until a new e2fsprogs release contains them, of course).

Best regards,

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot