rpms/e2fsprogs/F-10 e2fsprogs-1.41.4-debugfs-stat-segfault.patch, NONE, 1.1 e2fsprogs-1.41.4-fix-blkid-segfault.patch, NONE, 1.1 e2fsprogs.spec, 1.125, 1.126
Eric Sandeen
sandeen at fedoraproject.org
Fri Feb 27 00:47:13 UTC 2009
Author: sandeen
Update of /cvs/pkgs/rpms/e2fsprogs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26818
Modified Files:
e2fsprogs.spec
Added Files:
e2fsprogs-1.41.4-debugfs-stat-segfault.patch
e2fsprogs-1.41.4-fix-blkid-segfault.patch
Log Message:
* Thu Feb 26 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-4
- Edit summary & description to include ext4 (#487469)
- Fix blkid null ptr deref in initrd (#486997)
e2fsprogs-1.41.4-debugfs-stat-segfault.patch:
--- NEW FILE e2fsprogs-1.41.4-debugfs-stat-segfault.patch ---
Index: e2fsprogs/debugfs/debugfs.c
===================================================================
--- e2fsprogs.orig/debugfs/debugfs.c 2008-09-12 10:37:52.000000000 -0500
+++ e2fsprogs/debugfs/debugfs.c 2009-01-29 16:36:04.748574864 -0600
@@ -291,9 +291,6 @@ void do_show_super_stats(int argc, char
int c, header_only = 0;
int numdirs = 0, first, gdt_csum;
- gdt_csum = EXT2_HAS_RO_COMPAT_FEATURE(current_fs->super,
- EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
-
reset_getopt();
while ((c = getopt (argc, argv, "h")) != EOF) {
switch (c) {
@@ -321,6 +318,8 @@ void do_show_super_stats(int argc, char
return;
}
+ gdt_csum = EXT2_HAS_RO_COMPAT_FEATURE(current_fs->super,
+ EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
gdp = ¤t_fs->group_desc[0];
for (i = 0; i < current_fs->group_desc_count; i++, gdp++) {
fprintf(out, " Group %2d: block bitmap at %u, "
e2fsprogs-1.41.4-fix-blkid-segfault.patch:
--- NEW FILE e2fsprogs-1.41.4-fix-blkid-segfault.patch ---
The coverity scanner found this one.
If a line in modules.dep has a ":" but no "/" then:
if ((cp = strchr(buf, ':')) != NULL)
*cp = 0;
else
continue;
if ((cp = strrchr(buf, '/')) != NULL)
cp++;
/* XXX else cp is still null */
i = strlen(cp);
... we will deref a null pointer (cp). This can be
demonstrated by putting a line like:
foo.ko:
into modules.dep. The below change just says that if no "/" is
found, treat the whole string as the module name.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---
Index: e2fsprogs/e2fsck/util.c
===================================================================
--- e2fsprogs.orig/e2fsck/util.c
+++ e2fsprogs/e2fsck/util.c
@@ -663,6 +663,8 @@ int check_for_modules(const char *fs_nam
continue;
if ((cp = strrchr(buf, '/')) != NULL)
cp++;
+ else
+ cp = buf;
i = strlen(cp);
if (i > 3) {
t = cp + i - 3;
Index: e2fsprogs/lib/blkid/probe.c
===================================================================
--- e2fsprogs.orig/lib/blkid/probe.c
+++ e2fsprogs/lib/blkid/probe.c
@@ -227,6 +227,8 @@ static int check_for_modules(const char
continue;
if ((cp = strrchr(buf, '/')) != NULL)
cp++;
+ else
+ cp = buf;
i = strlen(cp);
if (i > 3) {
t = cp + i - 3;
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-10/e2fsprogs.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- e2fsprogs.spec 4 Feb 2009 06:34:46 -0000 1.125
+++ e2fsprogs.spec 27 Feb 2009 00:46:43 -0000 1.126
@@ -1,10 +1,10 @@
%define _root_sbindir /sbin
%define _root_libdir /%{_lib}
-Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
+Summary: Utilities for managing ext2, ext3, and ext4 filesystems
Name: e2fsprogs
Version: 1.41.4
-Release: 1%{?dist}
+Release: 4%{?dist}
# License based on upstream-modified COPYING file,
# which clearly states "V2" intent.
License: GPLv2
@@ -15,8 +15,10 @@
Source3: uuidd.init
Patch1: e2fsprogs-1.38-etcblkid.patch
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-journal-move.patch
+Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
+Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
+Patch10: e2fsprogs-journal-move.patch
Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,21 +28,21 @@
%description
The e2fsprogs package contains a number of utilities for creating,
-checking, modifying, and correcting any inconsistencies in second
-and third extended (ext2/ext3) filesystems. E2fsprogs contains
-e2fsck (used to repair filesystem inconsistencies after an unclean
-shutdown), mke2fs (used to initialize a partition to contain an
-empty ext2 filesystem), debugfs (used to examine the internal
+checking, modifying, and correcting any inconsistencies in second,
+third and fourth extended (ext2/ext3/ext4) filesystems. E2fsprogs
+contains e2fsck (used to repair filesystem inconsistencies after an
+unclean shutdown), mke2fs (used to initialize a partition to contain
+an empty ext2 filesystem), debugfs (used to examine the internal
structure of a filesystem, to manually repair a corrupted
filesystem, or to create test cases for e2fsck), tune2fs (used to
modify filesystem parameters), and most of the other core ext2fs
filesystem utilities.
You should install the e2fsprogs package if you need to manage the
-performance of an ext2 and/or ext3 filesystem.
+performance of an ext2, ext3, or ext4 filesystem.
%package libs
-Summary: Ext2/3 filesystem-specific shared libraries and headers
+Summary: Ext2/3/4 filesystem-specific shared libraries and headers
Group: Development/Libraries
# License based on upstream-modified COPYING file,
# which clearly states "V2" intent as well as other
@@ -52,7 +54,7 @@
E2fsprogs-lib contains the libraries of the e2fsprogs package.
%package devel
-Summary: Ext2/3 filesystem-specific static libraries and headers
+Summary: Ext2/3/4 filesystem-specific static libraries and headers
Group: Development/Libraries
# License based on upstream-modified COPYING file,
# which clearly states [L]GPLv2 intent as well as other
@@ -66,10 +68,10 @@
%description devel
E2fsprogs-devel contains the libraries and header files needed to
-develop second and third extended (ext2/ext3) filesystem-specific
-programs.
+develop second, third and fourth extended (ext2/ext3/ext4)
+filesystem-specific programs.
-You should install e2fsprogs-devel if you want to develop ext2/ext3
+You should install e2fsprogs-devel if you want to develop ext2/3/4
filesystem-specific programs. If you install e2fsprogs-devel, you'll
also want to install e2fsprogs.
@@ -93,10 +95,14 @@
# mildly unsafe but 'til I get something better, avoid full fsck
# after an selinux install...
%patch2 -p1 -b .featurecheck
-# Only change the journal placement for ext4, for now.
-%patch3 -p1 -b .journalmove
-# Fix info for libext2fs
+# Fix segfault in debugfs "stat" if fs not open
+%patch3 -p1 -b .statfs
+# Fix up name of info file
%patch4 -p1 -b .info
+# Fix blkid segfault in modules.dep scanning
+%patch5 -p1 -b .info
+# Only change the journal placement for ext4, for now.
+%patch10 -p1 -b .journalmove
%build
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
@@ -295,6 +301,14 @@
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
%changelog
+* Thu Feb 26 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-4
+- Edit summary & description to include ext4 (#487469)
+- Fix blkid null ptr deref in initrd (#486997)
+
+* Thu Jan 29 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-2
+- Fix debugfs "stat" segfault if no open fs (#482894)
+- Fix name of libext2fs info page (#481620)
+
* Wed Jan 04 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-1
- New upstream release
- Fix info page for libext2fs (#481620)
More information about the fedora-extras-commits
mailing list