Merge tag 'v1.47.3-rc2' into debian/experimental

v1.47.3-rc2

Author: tytso

debian/changelog

@@ -1,3 +1,21 @@
+e2fsprogs (1.47.3~rc2-1) experimental; urgency=medium
+
+  * Add a lockfile command-line option to fuse2fs which is useful for
+    scripts that need to know when fuse2fs is done modifying the file system
+    after it is unmounted.
+  * Fix mke2fs -d when importing large directories (Closes: #1106854)
+  * Fix indention problem in the man page for mke2fs
+  * Fix a (hard to reproduce) extent tree corruption bug which could be
+    triggered by resize2fs or fuse2fs if the extent tree was especially complex
+  * Fix error path handling in fuse2fs when servicing an op_create request.
+  * Fix spurious warnings from fuse2fs while servicing an op_fallocate request.
+  * Fix fuse2fs to correctly translate system errors from libext2fs to the
+    negative error codes expected by the FUSE kernel driver.
+  * Update Czech, Chinese, Dutch, French, Portuguese, Polish, Romainian,
+    Serbian, Spanish, Swedish, and Ukrainian translations.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 13 Jun 2025 14:24:46 -0400
+
 e2fsprogs (1.47.3~rc1-1) experimental; urgency=medium
 
   * Mke2fs -d can now copy the fs-verity metadata and chattr flags
@@ -62,6 +80,55 @@ e2fsprogs (1.47.3~rc1-1) experimental; urgency=medium
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Wed, 28 May 2025 08:50:19 -0400
 
+e2fsprogs (1.47.2-3) unstable; urgency=medium
+
+  * Fix a typo in fuse2fs.postrm which breaks /usr-move mitigation
+    (Closes: #1107595)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 10 Jun 2025 14:59:29 -0400
+
+e2fsprogs (1.47.2-2) unstable; urgency=medium
+
+  * Fix integer overflow bug which resulted in fuse2fs failing to delete
+    very large files (Closes: #1106241)
+  * Fix an extent corruption bug which in very rare cases could result in
+    data loss when resizing a file system or when fuse2fs is operating on
+    that file system
+  * Various man page cleanups
+  * Add a Built-Using field to the e2fsck-static man page to honor a LGPL
+    requirement documenting which version of glibc was used to build the
+    e2fsck.static binary (Closes: #1106799)
+  * Remove the physical address of the FSF from the debian/copyright
+    file, addressing a Lintian warning.
+  * Fix bug in debugfs when user passes invalid arguments to the
+    e2freefrag command
+  * Add range checks to "mke2fs -E <desc_size>"
+  * Check to make the invalid value of 0 is not passed to "e2freefrag -c"
+  * Fix "e2fsck -E unshare_blocks" to clear the shared_blocks flag when
+    there are no shared blocks to clear
+  * Fix mke2fs to disallow the verity feature without extents
+  * Fix fuse2fs to reject renameat2 RENAME_EXCHANGE/RENAME_WHITEOUT
+    instead of treating the request (wrongly) as a normal rename
+  * Fix fuse2fs to set the timestamps for the new inode created by a mkdir
+    or symlink request
+  * Fix fuse2fs to clamp the timestamps written to the file system to fix
+    a Y2038 bug as tested by fstests generic/402
+  * Fix fuse2fs to handle the encoding of POSIX acl's correctly
+  * Fix fuse2fs to return EOPNOTSUPP when a fallocate(2) mode is not supported
+  * Fix fuse2fs to refuse mounting a file system with file system features
+    that it doesn't know how to handle
+  * Fix debugfs's dump and rdump commands to avoid looping forever when
+    it runs across an I/O error or corupt filesystem metadata.
+  * Fix debugfs's dirsearch command on big-endian systems.
+  * Optimize ext2fs_extent_set_bmap() to avoid fragmenting the extent
+    tree.  This fixes a problem where resize2fs is trying to relocate
+    all of the blocks in a file leading to the extent tree doubling in
+    size, and potentially leading to a corrupted extent tree.
+  * Fix "e2fsck -n" to not abort when it trips across an EA inode which
+    is not referenced by any inodes in the file system.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 09 Jun 2025 20:49:10 -0400
+
 e2fsprogs (1.47.2-1) unstable; urgency=medium
 
   * New upstream version

debian/control

@@ -46,6 +46,7 @@ Description: save the output of a command in a log file
 
 Package: e2fsck-static
 Build-Profiles: <!pkg.e2fsprogs.no-static>
+Built-Using: ${misc:Built-Using}
 Priority: optional
 Depends: ${misc:Depends}
 Recommends: sash | bash-static | zsh-static | busybox-static

debian/copyright

@@ -375,9 +375,7 @@ License: GPL-2+ with Texinfo exception
  General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this texinfo.tex file; see the file COPYING.  If not, write
- to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  As a special exception, when this file is read by TeX when processing
  a Texinfo source document, you may use the result without
@@ -492,9 +490,7 @@ License: GPL-2+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program (in the main directory of the fuse-ext2
- distribution in the file COPYING); if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
 Comment:
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/fuse2fs.postrm

@@ -3,7 +3,7 @@
 set -e
 
 # begin-remove-after: released:trixie
-if test "$1" = remove || test "$1" = upgrade -o "$1" = failed-upgrade - o "$1" = abort-install -o "$1" = abort-upgrade && dpkg --compare-versions "$2" lt 1.47.2~rc1-1~; then
+if test "$1" = remove || test "$1" = upgrade -o "$1" = failed-upgrade -o "$1" = abort-install -o "$1" = abort-upgrade && dpkg --compare-versions "$2" lt 1.47.2~rc1-1~; then
     # DEP17 P1 mitigation.
     for cmd in /sbin/mount.fuse-ext2 /sbin/mount.fuseext2; do
         dpkg-divert --package fuse2fs --no-rename --divert "$cmd.usr-is-merged" --remove "$cmd"

debian/rules

@@ -195,7 +195,7 @@ endif
 override_dh_gencontrol:
 	dh_gencontrol -pcomerr-dev -- -v${COMERR_VERSION}-${DEB_VERSION} -VmainBinary=${DEB_VERSION}
 	dh_gencontrol -pss-dev -- -v${SS_VERSION}-${DEB_VERSION} -VmainBinary=${DEB_VERSION}
-	dh_gencontrol --remaining-packages
+	dh_gencontrol --remaining-packages -- -Vmisc:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version})' -W libc-dev-bin)"
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

doc/RelNotes/v1.47.3.txt

@@ -1,5 +1,5 @@
-E2fsprogs 1.47.3 (May 28, 2025)
-===============================
+E2fsprogs 1.47.3 (June 12, 2025)
+================================
 
 Updates/Fixes since v1.47.2:
 
@@ -19,6 +19,10 @@ including support for nanosecond timestamps.
 
 Add support to fuse2fs to set newer chattr flags.
 
+Add a lockfile command-line option to fuse2fs which is useful for
+scripts that need to know when fuse2fs is done modifying the file system
+after it is unmounted.
+
 Add mke2fs.conf knobs to control whether the RAID stripe or stride sizes
 from the storage device information depending on whether the storage
 device is a rotational or non-rotational device.  By default don't set
@@ -47,6 +51,13 @@ correctly after the mkdir(2) and symlink(2) operations.
 Fix fuse2fs's error code handling for fallocate(), truncate() and
 removexattr().
 
+Fix an integer overflow bug which resulted in fuse2fs failing to delete
+very large files.  (Addresses Debian Bug: #1106241)
+
+Fix a (hard to reproduce) extent tree corruption bug which could be
+triggered by resize2fs or fuse2fs if the extent tree was especially
+complex
+
 Improve fuse2fs's handling of corrupted file systems.
 
 Fuse2fs doesn't support renameat2()'s RENAME_EXCHANGE or RENAME_WHITEOUT
@@ -68,6 +79,15 @@ control decisions to the kernel.
 Prevent fuse2fs from mounting file systems which have features that
 fuse2fs can't deal with.
 
+Fix error path handling in fuse2fs when servicing an op_create request.
+
+Fix spurious warnings from fuse2fs while servicing an op_fallocate request.
+
+Fix fuse2fs to correctly translate system errors from libext2fs to the
+negative error codes expected by the FUSE kernel driver.  There aren't
+many; but in some cases, when the file system is corrupted, libext2fs
+will return EOVERFLOW and we sent a nonsense error to the kernel.
+
 Optimize ext2fs_extent_set_bmap() to avoid fragmenting the extent tree.
 This fixes a problem where resize2fs is trying to relocate all of the
 blocks in a file leading to the extent tree doubling in size, and
@@ -125,4 +145,8 @@ Fixed potention races in the Makefiles which could show up when using
 
 Fixed build failures when libarchive is not available.
 
-Update Dutch, Malay, Portuguese, and Serbian translations.
+Fixed various Debian packaging issues.  (Addresses Debian Bugs:
+#1106799, #1107595)
+
+Update Czech, Chinese, Dutch, French, Malay, Portuguese, Polish,
+Romainian, Serbian, Spanish, Swedish, and Ukrainian translations.

doc/libext2fs.texinfo

@@ -61,7 +61,7 @@ by the author.
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
 @subtitle Version 1.47.3
-@subtitle May 2025
+@subtitle June 2025
 
 @author by Theodore Ts'o
 

lib/ext2fs/extent.c

@@ -1531,6 +1531,15 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
 #ifdef DEBUG
 		printf("(re/un)mapping first block in extent\n");
 #endif
+		extent.e_pblk++;
+		extent.e_lblk++;
+		extent.e_len--;
+		retval = ext2fs_extent_replace(handle, 0, &extent);
+		if (retval)
+			goto done;
+		retval = ext2fs_extent_fix_parents(handle);
+		if (retval)
+			goto done;
 		if (physical) {
 			if (has_prev &&
 			    (logical == (prev_extent.e_lblk +
@@ -1560,15 +1569,6 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
 			if (retval)
 				goto done;
 		}
-		extent.e_pblk++;
-		extent.e_lblk++;
-		extent.e_len--;
-		retval = ext2fs_extent_replace(handle, 0, &extent);
-		if (retval)
-			goto done;
-		retval = ext2fs_extent_fix_parents(handle);
-		if (retval)
-			goto done;
 	} else {
 		__u32	save_length;
 		blk64_t	save_lblk;

lib/ext2fs/fallocate.c

@@ -276,6 +276,11 @@ static errcode_t ext_falloc_helper(ext2_filsys fs,
 				max_uninit_len : max_init_len))
 			goto try_left;
 
+		/* Would they even be physically contiguous if merged? */
+		if (left_ext->e_pblk + left_ext->e_len + range_len !=
+				right_ext->e_pblk)
+			goto try_left;
+
 		err = ext2fs_extent_goto(handle, left_ext->e_lblk);
 		if (err)
 			goto try_left;

lib/ext2fs/link.c

@@ -641,7 +641,7 @@ errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
 		struct dir_context ctx;
 
 		lblk = (inode.i_size / fs->blocksize) - 1;
-		retval = ext2fs_bmap2(fs, ino, &inode, NULL, 0, lblk,
+		retval = ext2fs_bmap2(fs, dir, &inode, NULL, 0, lblk,
 				      NULL, &pblk);
 		if (retval)
 			return retval;