diff options
author | Theodore Ts'o <tytso@mit.edu> | 2018-08-21 10:55:07 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-21 11:33:46 -0400 |
commit | 5c36535a6fc0435e19aa5347b83e960deb536757 (patch) | |
tree | 5cf57b94a74b4c1c1389d586f8a173ea054d0432 /debian | |
parent | eee05549b68661a58c5f2aac1101e24d5c292072 (diff) |
Rediff patches for 1.44.4-2 release
Add 0001-tune2fs-fix-dereference-of-freed-memory-after-journa.patch
Add 0002-libe2p-fix-verity-flag-bit.patch
Add 0003-libext2fs-add-verity-flag-to-EXT2_LIB_FEATURE_RO_COM.patch
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'debian')
4 files changed, 89 insertions, 0 deletions
diff --git a/debian/patches/0001-tune2fs-fix-dereference-of-freed-memory-after-journa.patch b/debian/patches/0001-tune2fs-fix-dereference-of-freed-memory-after-journa.patch new file mode 100644 index 00000000..e5ac27a5 --- /dev/null +++ b/debian/patches/0001-tune2fs-fix-dereference-of-freed-memory-after-journa.patch @@ -0,0 +1,25 @@ +From: Theodore Ts'o <tytso@mit.edu> +Date: Sun, 19 Aug 2018 16:46:04 -0400 +Subject: tune2fs: fix dereference of freed memory after journal replay + +This can be found by running the test t_replay_and_set under valgrind. + +Reported-by: Chris Clayton <chris2553@googlemail.com> +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Origin: Upstream, https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=maint&id=ed50488ec0f0 +--- + misc/tune2fs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/misc/tune2fs.c b/misc/tune2fs.c +index 723f7ae..b8cddfa 100644 +--- a/misc/tune2fs.c ++++ b/misc/tune2fs.c +@@ -3051,6 +3051,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n" + ext2fs_close_free(&fs); + exit(1); + } ++ sb = fs->super; + } + #endif + diff --git a/debian/patches/0002-libe2p-fix-verity-flag-bit.patch b/debian/patches/0002-libe2p-fix-verity-flag-bit.patch new file mode 100644 index 00000000..7ffbd6b3 --- /dev/null +++ b/debian/patches/0002-libe2p-fix-verity-flag-bit.patch @@ -0,0 +1,28 @@ +From: Eric Biggers <ebiggers@google.com> +Date: Mon, 20 Aug 2018 16:37:37 -0700 +Subject: libe2p: fix verity flag bit + +The verity flag was mapped to EXT4_PROJINHERIT_FL, presumably due to a +copy+paste error. Fix it. + +Fixes: faae7aa00df0 ("Reserve codepoints for the fsverity feature.") +Signed-off-by: Eric Biggers <ebiggers@google.com> +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Origin: Upstream, https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=maint&id=7e5a95e3d597 +--- + lib/e2p/pf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c +index 1c4bdde..884f167 100644 +--- a/lib/e2p/pf.c ++++ b/lib/e2p/pf.c +@@ -46,7 +46,7 @@ static struct flags_name flags_array[] = { + { FS_NOCOW_FL, "C", "No_COW" }, + { EXT4_INLINE_DATA_FL, "N", "Inline_Data" }, + { EXT4_PROJINHERIT_FL, "P", "Project_Hierarchy" }, +- { EXT4_PROJINHERIT_FL, "V", "Verity" }, ++ { EXT4_VERITY_FL, "V", "Verity" }, + { 0, NULL, NULL } + }; + diff --git a/debian/patches/0003-libext2fs-add-verity-flag-to-EXT2_LIB_FEATURE_RO_COM.patch b/debian/patches/0003-libext2fs-add-verity-flag-to-EXT2_LIB_FEATURE_RO_COM.patch new file mode 100644 index 00000000..c1e08797 --- /dev/null +++ b/debian/patches/0003-libext2fs-add-verity-flag-to-EXT2_LIB_FEATURE_RO_COM.patch @@ -0,0 +1,33 @@ +From: Eric Biggers <ebiggers@google.com> +Date: Mon, 20 Aug 2018 17:15:52 -0700 +Subject: libext2fs: add verity flag to EXT2_LIB_FEATURE_RO_COMPAT_SUPP + +The new ro_compat filesystem feature flag for fs-verity was added to +EXT2_FEATURE_RO_COMPAT_SUPP, but that's not actually used by e2fsprogs +itself. So contrary to the v1.44.4 release notes, 'mke2fs -O verity' +doesn't actually work, nor does e2fsck allow the filesystem to have the +verity feature. Fix it by adding the flag to the correct place +(EXT2_LIB_FEATURE_RO_COMPAT_SUPP) too. + +Fixes: faae7aa00df0 ("Reserve codepoints for the fsverity feature.") +Signed-off-by: Eric Biggers <ebiggers@google.com> +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Origin: Upstream, https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=maint&id=76e28a133989 +--- + lib/ext2fs/ext2fs.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h +index 3d4afac..c86596a 100644 +--- a/lib/ext2fs/ext2fs.h ++++ b/lib/ext2fs/ext2fs.h +@@ -625,7 +625,8 @@ typedef struct ext2_icount *ext2_icount_t; + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\ + EXT4_FEATURE_RO_COMPAT_READONLY |\ + EXT4_FEATURE_RO_COMPAT_PROJECT |\ +- EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS) ++ EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS |\ ++ EXT4_FEATURE_RO_COMPAT_VERITY) + + /* + * These features are only allowed if EXT2_FLAG_SOFTSUPP_FEATURES is passed diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..cf2dd7dc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-tune2fs-fix-dereference-of-freed-memory-after-journa.patch +0002-libe2p-fix-verity-flag-bit.patch +0003-libext2fs-add-verity-flag-to-EXT2_LIB_FEATURE_RO_COM.patch |