diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-01-13 17:37:28 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-17 11:32:16 +0000 |
commit | a1f235ad736d322bb50eb4a4293b6b2f4e5200aa (patch) | |
tree | 03b4c525f754c89c3e307823f37e6a944726375c /meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch | |
parent | 8a474057d86b3ebf6271656d6b9adf384ea9ad6d (diff) | |
download | openembedded-core-contrib-a1f235ad736d322bb50eb4a4293b6b2f4e5200aa.tar.gz |
e2fsprogs: 1.42.9 -> 1.43 (master)
Upgrade to 1.43 (master) to make "mke2fs -d" support xattr, so that the
layer which requires xattr such as meta-selinux can populate images
easily.
* Remove the following patches since they are alredy in the source.
0001-e2fsprogs-fix-cross-compilation-problem.patch
0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch
0002-misc-create_inode.c-copy-files-recursively.patch
0003-misc-create_inode.c-create-special-file.patch
0004-misc-create_inode.c-create-symlink.patch
0005-misc-create_inode.c-copy-regular-file.patch
0006-misc-create_inode.c-create-directory.patch
0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch
0008-mke2fs.c-add-an-option-d-root-directory.patch
0009-misc-create_inode.c-handle-hardlinks.patch
0010-debugfs-use-the-functions-in-misc-create_inode.c.patch
0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch
0012-Fix-musl-build-failures.patch
CVE-2015-0247.patch
copy-in-create-hardlinks-with-the-correct-directory-.patch
fix-icache.patch
misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
* Remove cache_inode.patch since it is not needed any more
* Updated mkdir.patch and ptest.patch
* Add --enable-libblkid to EXTRA_OECONF since libblkid is not created by
default.
* Time of core-image-sato-sdk do_rootfs:
- Before upgrade
real 3m18.508s
user 7m42.088s
sys 1m1.984s
- After upgrade
real 3m21.552s
user 7m38.496s
sys 1m0.644s
The are nearly the same
* The "fsck -f" shows the image is OK, and also can boot.
[YOCTO #8622]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch deleted file mode 100644 index 5b6346b150..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f66e6ce4446738c2c7f43d41988a3eb73347e2f5 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Sat, 9 Aug 2014 12:24:54 -0400 -Subject: libext2fs: avoid buffer overflow if s_first_meta_bg is too big - -If s_first_meta_bg is greater than the of number block group -descriptor blocks, then reading or writing the block group descriptors -will end up overruning the memory buffer allocated for the -descriptors. Fix this by limiting first_meta_bg to no more than -fs->desc_blocks. This doesn't correct the bad s_first_meta_bg value, -but it avoids causing the e2fsprogs userspace programs from -potentially crashing. - -Upstream-Status: Backport -CVE: CVE-2015-0247 - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> - -diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c -index 4599eef..1f99113 100644 ---- a/lib/ext2fs/closefs.c -+++ b/lib/ext2fs/closefs.c -@@ -344,9 +344,11 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags) - * superblocks and group descriptors. - */ - group_ptr = (char *) group_shadow; -- if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) -+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { - old_desc_blocks = fs->super->s_first_meta_bg; -- else -+ if (old_desc_blocks > fs->super->s_first_meta_bg) -+ old_desc_blocks = fs->desc_blocks; -+ } else - old_desc_blocks = fs->desc_blocks; - - ext2fs_numeric_progress_init(fs, &progress, NULL, -diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c -index a1a3517..ba501e6 100644 ---- a/lib/ext2fs/openfs.c -+++ b/lib/ext2fs/openfs.c -@@ -378,9 +378,11 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, - #ifdef WORDS_BIGENDIAN - groups_per_block = EXT2_DESC_PER_BLOCK(fs->super); - #endif -- if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) -+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { - first_meta_bg = fs->super->s_first_meta_bg; -- else -+ if (first_meta_bg > fs->desc_blocks) -+ first_meta_bg = fs->desc_blocks; -+ } else - first_meta_bg = fs->desc_blocks; - if (first_meta_bg) { - retval = io_channel_read_blk(fs->io, group_block + --- -cgit v0.10.2 - |