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-18 11:47:03 +0000 |
commit | 8c3276ecea38d4d67c22e6db49060b2d4b457278 (patch) | |
tree | a08abeadef1a30dff799b50755a33a4faf8ab33c /meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch | |
parent | b248e55c0c39a4d45adc0690f2eefb332ab233f5 (diff) | |
download | poky-8c3276ecea38d4d67c22e6db49060b2d4b457278.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]
(From OE-Core rev: a1f235ad736d322bb50eb4a4293b6b2f4e5200aa)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch deleted file mode 100644 index b904e46bda..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From 49d0fe2a14f2a23da2fe299643379b8c1d37df73 Mon Sep 17 00:00:00 2001 | ||
2 | From: Theodore Ts'o <tytso@mit.edu> | ||
3 | Date: Fri, 6 Feb 2015 12:46:39 -0500 | ||
4 | Subject: [PATCH] libext2fs: fix potential buffer overflow in closefs() | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | CVE: CVE-2015-1572 | ||
8 | |||
9 | The bug fix in f66e6ce4446: "libext2fs: avoid buffer overflow if | ||
10 | s_first_meta_bg is too big" had a typo in the fix for | ||
11 | ext2fs_closefs(). In practice most of the security exposure was from | ||
12 | the openfs path, since this meant if there was a carefully crafted | ||
13 | file system, buffer overrun would be triggered when the file system was | ||
14 | opened. | ||
15 | |||
16 | However, if corrupted file system didn't trip over some corruption | ||
17 | check, and then the file system was modified via tune2fs or debugfs, | ||
18 | such that the superblock was marked dirty and then written out via the | ||
19 | closefs() path, it's possible that the buffer overrun could be | ||
20 | triggered when the file system is closed. | ||
21 | |||
22 | Also clear up a signed vs unsigned warning while we're at it. | ||
23 | |||
24 | Thanks to Nick Kralevich <nnk@google.com> for asking me to look at | ||
25 | compiler warning in the code in question, which led me to notice the | ||
26 | bug in f66e6ce4446. | ||
27 | |||
28 | Addresses: CVE-2015-1572 | ||
29 | |||
30 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | ||
31 | --- | ||
32 | lib/ext2fs/closefs.c | 4 ++-- | ||
33 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
34 | |||
35 | diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c | ||
36 | index 1f99113..ab5b2fb 100644 | ||
37 | --- a/lib/ext2fs/closefs.c | ||
38 | +++ b/lib/ext2fs/closefs.c | ||
39 | @@ -287,7 +287,7 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags) | ||
40 | dgrp_t j; | ||
41 | #endif | ||
42 | char *group_ptr; | ||
43 | - int old_desc_blocks; | ||
44 | + blk64_t old_desc_blocks; | ||
45 | struct ext2fs_numeric_progress_struct progress; | ||
46 | |||
47 | EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); | ||
48 | @@ -346,7 +346,7 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags) | ||
49 | group_ptr = (char *) group_shadow; | ||
50 | if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { | ||
51 | old_desc_blocks = fs->super->s_first_meta_bg; | ||
52 | - if (old_desc_blocks > fs->super->s_first_meta_bg) | ||
53 | + if (old_desc_blocks > fs->desc_blocks) | ||
54 | old_desc_blocks = fs->desc_blocks; | ||
55 | } else | ||
56 | old_desc_blocks = fs->desc_blocks; | ||
57 | -- | ||
58 | 2.1.0 | ||
59 | |||