diff --git a/0023-fuse2fs-don-t-try-to-mount-after-option-parsing-errors.patch b/0023-fuse2fs-don-t-try-to-mount-after-option-parsing-errors.patch new file mode 100644 index 0000000000000000000000000000000000000000..9bc7fc409576d11cbd255f3e64eedb5f2d665355 --- /dev/null +++ b/0023-fuse2fs-don-t-try-to-mount-after-option-parsing-errors.patch @@ -0,0 +1,40 @@ +From e7774d8fef39d16eb96f1e55cf2f33d3acb14d88 Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Sun, 6 Jul 2025 11:32:50 -0700 +Subject: [PATCH] fuse2fs: don't try to mount after option parsing errors + +Actually check the outcome of parsing CLI options before trying to +mount. + +Signed-off-by: Darrick J. Wong +Link: https://lore.kernel.org/r/175182663113.1984706.10460295274868313866.stgit@frogsfrogsfrogs +Signed-off-by: Theodore Ts'o +--- + misc/fuse2fs.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c +index 0dc77ea..d0633bb 100644 +--- a/misc/fuse2fs.c ++++ b/misc/fuse2fs.c +@@ -3731,13 +3731,15 @@ int main(int argc, char *argv[]) + errcode_t err; + char *logfile; + char extra_args[BUFSIZ]; +- int ret = 0; ++ int ret; + int flags = EXT2_FLAG_64BITS | EXT2_FLAG_THREADS | EXT2_FLAG_EXCLUSIVE; + + memset(&fctx, 0, sizeof(fctx)); + fctx.magic = FUSE2FS_MAGIC; + +- fuse_opt_parse(&args, &fctx, fuse2fs_opts, fuse2fs_opt_proc); ++ ret = fuse_opt_parse(&args, &fctx, fuse2fs_opts, fuse2fs_opt_proc); ++ if (ret) ++ exit(1); + if (fctx.device == NULL) { + fprintf(stderr, "Missing ext4 device/image\n"); + fprintf(stderr, "See '%s -h' for usage\n", argv[0]); +-- +2.33.0 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 9c1b43438067ac605e76128ef243f182280ab17a..d0d06ba87f7e963392a69269bb39eaf3b6d953dc 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.47.0 -Release: 10 +Release: 11 Summary: Second extended file system management tools License: GPLv2+ and LGPLv2 and MIT URL: http://e2fsprogs.sourceforge.net/ @@ -29,6 +29,7 @@ Patch19: 0019-e2fsck-fix-acl-block-leak-when-process-orphan-list.patch Patch20: 0020-e2fsck-fix-handling-of-a-invalid-symlink-in-an-inlin.patch Patch21: 0021-e2fsprogs-modify-dumpe2fs-to-report-free-block-range.patch Patch22: 0022-resize2fs-use-Direct-I-O-when-reading-the-superblock.patch +Patch23: 0023-fuse2fs-don-t-try-to-mount-after-option-parsing-errors.patch BuildRequires: gcc pkgconfig texinfo BuildRequires: fuse-devel libblkid-devel libuuid-devel @@ -169,6 +170,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Thu Dec 4 2025 xuchenchen - 1.47.0-11 +- fuse2fs: don't try to mount after option parsing errors + * Wed Aug 20 2025 zhangjian - 1.47.0-10 - sync patches from 2403-sp2