New upstream release 1.44.1

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
This commit is contained in:
Lukas Czerner 2018-04-04 13:19:39 +02:00
parent 01d98d5b63
commit bdd9381799
4 changed files with 7 additions and 62 deletions

1
.gitignore vendored
View File

@ -31,3 +31,4 @@ e2fsprogs-1.41.12.tar.gz
/e2fsprogs-1.43.8.tar.xz
/e2fsprogs-1.43.9.tar.xz
/e2fsprogs-1.44.0.tar.xz
/e2fsprogs-1.44.1.tar.xz

View File

@ -1,56 +0,0 @@
From 1d9ec88df621a74abb2a0430b474cac3c4fc998a Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Fri, 9 Mar 2018 12:28:02 +0100
Subject: [PATCH] e2fsck: fix endianness problem when reading htree nodes
Wrong directory block number can be saved in ->previous on big endian
system in parse_int_node(). Fix it by moving the mask out of the endian
conversion.
Fixes: ae9efd05a986 ("e2fsck: 3 level hash tree directory optimization")
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
e2fsck/pass2.c | 5 +++--
lib/ext2fs/ext2_fs.h | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index 1b0504c..e922876 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -643,7 +643,7 @@ static void parse_int_node(ext2_filsys fs,
printf("Entry #%d: Hash 0x%08x, block %u\n", i,
hash, ext2fs_le32_to_cpu(ent[i].block));
#endif
- blk = ext2fs_le32_to_cpu(ent[i].block) & 0x0ffffff;
+ blk = ext2fs_le32_to_cpu(ent[i].block) & EXT4_DX_BLOCK_MASK;
/* Check to make sure the block is valid */
if (blk >= (blk_t) dx_dir->numblocks) {
cd->pctx.blk = blk;
@@ -664,7 +664,8 @@ static void parse_int_node(ext2_filsys fs,
}
dx_db->previous =
- i ? ext2fs_le32_to_cpu(ent[i-1].block & 0x0ffffff) : 0;
+ i ? (ext2fs_le32_to_cpu(ent[i-1].block) &
+ EXT4_DX_BLOCK_MASK) : 0;
if (hash < min_hash)
min_hash = hash;
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 2496d16..7d62694 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -232,6 +232,8 @@ struct ext2_dx_root_info {
#define EXT2_HASH_FLAG_INCOMPAT 0x1
+#define EXT4_DX_BLOCK_MASK 0x0fffffff
+
struct ext2_dx_entry {
__le32 hash;
__le32 block;
--
2.7.5

View File

@ -1,7 +1,7 @@
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
Name: e2fsprogs
Version: 1.44.0
Release: 2%{?dist}
Version: 1.44.1
Release: 1%{?dist}
# License tags based on COPYING file distinctions for various components
License: GPLv2
@ -11,7 +11,6 @@ Source1: ext2_types-wrapper.h
Source2: e2fsck.conf
Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
Patch2: e2fsprogs-1.44.0-e2fsck-fix-endianness-problem-when-reading-htree-nod.patch
Url: http://e2fsprogs.sourceforge.net/
Requires: e2fsprogs-libs%{?_isa} = %{version}-%{release}
@ -151,8 +150,6 @@ It was originally inspired by the Multics SubSystem library.
# mildly unsafe but 'til I get something better, avoid full fsck
# after an selinux install...
%patch1 -p1 -b .featurecheck
# e2fsck: fix endianness problem when reading htree nodes
%patch2 -p1
%build
@ -332,6 +329,9 @@ exit 0
%{_libdir}/pkgconfig/ss.pc
%changelog
* Mon Apr 04 2018 Lukas Czerner <lczerner@redhat.com> 1.44.1-1
- New upstream release
* Mon Mar 12 2018 Lukas Czerner <lczerner@redhat.com> 1.44.0-2
- e2fsck: fix endianness problem when reading htree nodes
- use make fullcheck in %check section to run all the tests

View File

@ -1 +1 @@
SHA512 (e2fsprogs-1.44.0.tar.xz) = ecdb6d5d0c3522b2db0631c0fad54d31c87192e0dd34a534113319e7226af93f5338af86c2f63c16b0f812b45c03d7b6d8a2e08013799f0617222050ff3177ae
SHA512 (e2fsprogs-1.44.1.tar.xz) = 88dc96c1420ab7b958c7b49179524f34db4073f865414a121d898ac347fae9182f757314653861f4aa8324bb49f944f0648840c704d124dee22c06ba0406ee55