New e2fsprogs-1.42-0.3.WIP.0925 snapshot release
This commit is contained in:
parent
89445df264
commit
6f81ee7c11
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ e2fsprogs-1.41.12.tar.gz
|
||||
/e2fsprogs-1.41.13.tar.gz
|
||||
/e2fsprogs-1.41.14.tar.gz
|
||||
/e2fsprogs-1.42-WIP-0702.tar.gz
|
||||
/e2fsprogs-1.42-WIP-0925.tar.gz
|
||||
|
@ -1,50 +0,0 @@
|
||||
(submitted to list)
|
||||
|
||||
[PATCH] libext2fs: copy cluster_bits in ext2fs_copy_generic_bmap
|
||||
|
||||
The f_lotsbad regression test was failing on some systems
|
||||
with:
|
||||
|
||||
@@ -26,6 +61,7 @@
|
||||
|
||||
Restarting e2fsck from the beginning...
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
+Illegal block number passed to ext2fs_test_block_bitmap #0 for in-use block map
|
||||
Pass 2: Checking directory structure
|
||||
Entry 'termcap' in / (2) has deleted/unused inode 12. Clear? yes
|
||||
|
||||
Running with valgrind (./test_script --valgrind f_lotsbad) we
|
||||
see:
|
||||
|
||||
+==31409== Conditional jump or move depends on uninitialised value(s)
|
||||
+==31409== at 0x42927A: ext2fs_test_generic_bmap (gen_bitmap64.c:378)
|
||||
|
||||
among others.
|
||||
|
||||
Looking at gen_bitmap64.c:
|
||||
376: arg >>= bitmap->cluster_bits;
|
||||
377:
|
||||
378: if ((arg < bitmap->start) || (arg > bitmap->end)) {
|
||||
|
||||
A little more debugging showed that it was actually
|
||||
bitmap->cluster_bits which was uninitialized, because it never
|
||||
gets copied over in ext2fs_copy_generic_bmap()
|
||||
|
||||
Patch below resolves the issue.
|
||||
|
||||
Reported-by: Andreas Dilger <adilger@whamcloud.com>
|
||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
||||
---
|
||||
|
||||
Index: e2fsprogs-1.42/lib/ext2fs/gen_bitmap64.c
|
||||
===================================================================
|
||||
--- e2fsprogs-1.42.orig/lib/ext2fs/gen_bitmap64.c
|
||||
+++ e2fsprogs-1.42/lib/ext2fs/gen_bitmap64.c
|
||||
@@ -193,6 +193,7 @@ errcode_t ext2fs_copy_generic_bmap(ext2f
|
||||
new_bmap->real_end = src->real_end;
|
||||
new_bmap->bitmap_ops = src->bitmap_ops;
|
||||
new_bmap->base_error_code = src->base_error_code;
|
||||
+ new_bmap->cluster_bits = src->cluster_bits;
|
||||
|
||||
descr = src->description;
|
||||
if (descr) {
|
@ -4,17 +4,17 @@
|
||||
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
|
||||
Name: e2fsprogs
|
||||
Version: 1.42
|
||||
Release: 0.2.WIP.0702%{?dist}
|
||||
Release: 0.3.WIP.0925%{?dist}
|
||||
|
||||
# License tags based on COPYING file distinctions for various components
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
# Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/e2fsprogs-1.42-WIP-0702.tar.gz
|
||||
# Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/e2fsprogs-1.42-WIP-0702.tar.gz
|
||||
Source0: http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.42-WIP-0925.tar.gz
|
||||
Source1: ext2_types-wrapper.h
|
||||
|
||||
Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
||||
Patch2: e2fsprogs-1.42-copy_generic_bitmap-fix.patch
|
||||
|
||||
Url: http://e2fsprogs.sourceforge.net/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -150,8 +150,6 @@ It was originally inspired by the Multics SubSystem library.
|
||||
# after an selinux install...
|
||||
%patch1 -p1 -b .featurecheck
|
||||
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
|
||||
--disable-e2initrd-helper --disable-libblkid --disable-libuuid
|
||||
@ -283,9 +281,11 @@ exit 0
|
||||
%{_libdir}/libext2fs.so
|
||||
%{_libdir}/pkgconfig/e2p.pc
|
||||
%{_libdir}/pkgconfig/ext2fs.pc
|
||||
%{_libdir}/pkgconfig/quota.pc
|
||||
|
||||
%{_includedir}/e2p
|
||||
%{_includedir}/ext2fs
|
||||
%{_includedir}/quota
|
||||
|
||||
%files -n libcom_err
|
||||
%defattr(-,root,root)
|
||||
@ -318,10 +318,13 @@ exit 0
|
||||
%{_libdir}/pkgconfig/ss.pc
|
||||
|
||||
%changelog
|
||||
* Tue Aug 09 2011 Eric Sandeen <sandeen@redhat.com> 1.42-0.2.WIP.0702
|
||||
* Mon Sep 26 2011 Eric Sandeen <sandeen@redhat.com> 1.42-0.3.WIP.0925
|
||||
- Fix use of uninitialized memory via ext2fs_copy_generic_bmap()
|
||||
|
||||
* Tue Aug 09 2011 Eric Sandeen <sandeen@redhat.com> 1.42-0.1.WIP.0702
|
||||
* Tue Aug 09 2011 Eric Sandeen <sandeen@redhat.com> 1.42-0.2.WIP.0702
|
||||
- Fix use of uninitialized memory via ext2fs_copy_generic_bmap()
|
||||
|
||||
* Tue Aug 09 2011 Eric Sandeen <sandeen@redhat.com> 1.42-0.1.WIP.0702
|
||||
- Test release for >16T support
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.41.14-2
|
||||
|
Loading…
Reference in New Issue
Block a user