From 0fd402e7b1f64ed896b55cfecde8673f77682582 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Sat, 23 Aug 2008 15:54:45 +0000 Subject: * Thu Jul 10 2008 Eric Sandeen 1.41.0-1 - Don't check the group checksum when !GDT_CSUM (#459875) --- e2fsprogs-1.41-group-checksum-tests | 35 +++++++++++++++++++++++++++++++++++ e2fsprogs.spec | 13 +++++++++---- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 e2fsprogs-1.41-group-checksum-tests diff --git a/e2fsprogs-1.41-group-checksum-tests b/e2fsprogs-1.41-group-checksum-tests new file mode 100644 index 0000000..8fedab9 --- /dev/null +++ b/e2fsprogs-1.41-group-checksum-tests @@ -0,0 +1,35 @@ +From: Theodore Ts'o +Date: Sun, 13 Jul 2008 23:03:59 +0000 (-0400) +Subject: libext2fs: Don't check the group checksum when !GDT_CSUM +X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=4729455f0a68f2fa0a83ec8460d1d4bccba9dcfa + +libext2fs: Don't check the group checksum when !GDT_CSUM + +ext2fs_group_desc_csum_verify() is always checking the bg_checksum (to +make sure it is zero) even when the GDT_CSUM feature is not present. +This is normally OK, but apparently there are filesystems in the wild +where this field has not be initialized to zero. + +Addresses-Debian-Bug: #490637 + +Signed-off-by: "Theodore Ts'o" +--- + +diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c +index ce1508e..6a49d8f 100644 +--- a/lib/ext2fs/csum.c ++++ b/lib/ext2fs/csum.c +@@ -60,8 +60,10 @@ STATIC __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + + int ext2fs_group_desc_csum_verify(ext2_filsys fs, dgrp_t group) + { +- if (fs->group_desc[group].bg_checksum != +- ext2fs_group_desc_csum(fs, group)) ++ if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, ++ EXT4_FEATURE_RO_COMPAT_GDT_CSUM) && ++ (fs->group_desc[group].bg_checksum != ++ ext2fs_group_desc_csum(fs, group))) + return 0; + + return 1; + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index cda71d5..dba6fc6 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,7 @@ Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems Name: e2fsprogs Version: 1.41.0 -Release: 1%{?dist} +Release: 2%{?dist} # License based on upstream-modified COPYING file, # which clearly states "V2" intent. License: GPLv2 @@ -15,6 +15,7 @@ Source2: blkid_types-wrapper.h Source3: uuidd.init Patch1: e2fsprogs-1.38-etcblkid.patch Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch +Patch3: e2fsprogs-1.41-group-checksum-tests Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,6 +92,7 @@ SMP systems. # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... %patch2 -p1 -b .featurecheck +%patch3 -p1 -b .csum %build %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux @@ -289,8 +291,11 @@ fi %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid %changelog -* Thu Jul 10 2008 Eric Sandeen 1.41-1 -- New usptream release +* Thu Jul 10 2008 Eric Sandeen 1.41.0-1 +- Don't check the group checksum when !GDT_CSUM (#459875) + +* Thu Jul 10 2008 Eric Sandeen 1.41.0-1 +- New upstream version - ext4 capable * Mon Jul 07 2008 Eric Sandeen 1.41-0.2.WIP.0707 @@ -307,7 +312,7 @@ fi * Wed Jun 04 2008 Eric Sandeen 1.40.10-3 - Tidy up multilib hack for non-multilib arches (#446016) -- Fix up %postun script (#449868) +- Fix up postun script (#449868) * Wed Jun 04 2008 Dennis Gilmore 1.40.10-2 - setup header support for sparc -- cgit