Accepting request 308742 from home:jankara:branches:filesystems
Update to 1.42.13 OBS-URL: https://build.opensuse.org/request/show/308742 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=62
This commit is contained in:
Jan Kara
Git OBS Bridge
parent
d7e5527a4e
commit
160595e765
@ -1,51 +0,0 @@
|
||||
From ebdf895b43a1ce499e4d2556a201e2a753fc422f Mon Sep 17 00:00:00 2001
|
||||
From: Theodore Ts'o <tytso@mit.edu>
|
||||
Date: Wed, 8 Oct 2014 11:18:41 -0400
|
||||
Subject: [PATCH] e2fsck: fix free pointer dereferences
|
||||
References: bnc#912229
|
||||
|
||||
Commit 47fee2ef6a23a introduces some free pointer dereference bugs by
|
||||
not clearing ctx->fs after calling ext2fs_close_free().
|
||||
|
||||
Reported-by: Matthias Andree <mandree@FreeBSD.org>
|
||||
Cc: Lukas Czerner <lczerner@redhat.com>
|
||||
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||
Acked-by: Jan Kara <jack@suse.cz>
|
||||
---
|
||||
e2fsck/unix.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
|
||||
index 66debcde53ed..10036e76132c 100644
|
||||
--- a/e2fsck/unix.c
|
||||
+++ b/e2fsck/unix.c
|
||||
@@ -458,7 +458,7 @@ static void check_if_skip(e2fsck_t ctx)
|
||||
}
|
||||
log_out(ctx, "\n");
|
||||
skip:
|
||||
- ext2fs_close_free(&fs);
|
||||
+ ext2fs_close_free(&ctx->fs);
|
||||
e2fsck_free_context(ctx);
|
||||
exit(FSCK_OK);
|
||||
}
|
||||
@@ -1462,7 +1462,7 @@ failure:
|
||||
/*
|
||||
* Restart in order to reopen fs but this time start mmp.
|
||||
*/
|
||||
- ext2fs_close_free(&fs);
|
||||
+ ext2fs_close_free(&ctx->fs);
|
||||
flags &= ~EXT2_FLAG_SKIP_MMP;
|
||||
goto restart;
|
||||
}
|
||||
@@ -1692,7 +1692,7 @@ no_journal:
|
||||
_("while resetting context"));
|
||||
fatal_error(ctx, 0);
|
||||
}
|
||||
- ext2fs_close_free(&fs);
|
||||
+ ext2fs_close_free(&ctx->fs);
|
||||
goto restart;
|
||||
}
|
||||
if (run_result & E2F_FLAG_ABORT)
|
||||
--
|
||||
2.1.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c
|
||||
size 6381695
|
||||
3
e2fsprogs-1.42.13.tar.gz
Normal file
3
e2fsprogs-1.42.13.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4
|
||||
size 6511931
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 26 12:15:35 UTC 2015 - jack@suse.cz
|
||||
|
||||
- Update to 1.42.13
|
||||
* fix potential buffer overflow while closing a filesystem
|
||||
* fix deadlock which occurs when using systemd and e2fsck.conf's logging
|
||||
feature
|
||||
* make tune2fs clear journal superblock backup when removing journal
|
||||
* fix use after free bugs in resize2fs and e2fsck
|
||||
* fix endianity bugs in libext2fs
|
||||
...
|
||||
- Remove e2fsck-fix-free-pointer-dereferences.patch: Merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 9 08:48:40 UTC 2015 - jack@suse.cz
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package e2fsprogs
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -61,7 +61,7 @@ Conflicts: libcom_err2-mini
|
||||
Conflicts: libcom_err-mini-devel
|
||||
%endif
|
||||
#
|
||||
Version: 1.42.12
|
||||
Version: 1.42.13
|
||||
Release: 0
|
||||
Summary: Utilities for the Second Extended File System
|
||||
License: GPL-2.0
|
||||
@ -80,7 +80,6 @@ Patch1: e2fsprogs-1.41.1-splash_support.patch
|
||||
Patch3: libcom_err-compile_et_permissions.patch
|
||||
Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
|
||||
Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch
|
||||
Patch6: e2fsck-fix-free-pointer-dereferences.patch
|
||||
# Do not suppress make commands
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -194,7 +193,6 @@ Development files for the com_err error message display library.
|
||||
%patch3 -p1
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
cp %{SOURCE2} .
|
||||
|
||||
%build
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
Index: e2fsprogs-1.41.7/lib/et/compile_et.sh.in
|
||||
Index: e2fsprogs-1.42.13/lib/et/compile_et.sh.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.7.orig/lib/et/compile_et.sh.in
|
||||
+++ e2fsprogs-1.41.7/lib/et/compile_et.sh.in
|
||||
--- e2fsprogs-1.42.13.orig/lib/et/compile_et.sh.in
|
||||
+++ e2fsprogs-1.42.13/lib/et/compile_et.sh.in
|
||||
@@ -51,7 +51,7 @@ if test -f ${BASE}.h && cmp -s ${BASE}.h
|
||||
rm -f ${BASE}.h.$$
|
||||
else
|
||||
mv -f ${BASE}.h.$$ ${BASE}.h
|
||||
- chmod -w ${BASE}.h
|
||||
+# chmod -w ${BASE}.h
|
||||
- chmod a-w ${BASE}.h
|
||||
+# chmod a-w ${BASE}.h
|
||||
fi
|
||||
$AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et"
|
||||
if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user