diff options
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 @@ | |||
1 | From f66e6ce4446738c2c7f43d41988a3eb73347e2f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Theodore Ts'o <tytso@mit.edu> | ||
3 | Date: Sat, 9 Aug 2014 12:24:54 -0400 | ||
4 | Subject: libext2fs: avoid buffer overflow if s_first_meta_bg is too big | ||
5 | |||
6 | If s_first_meta_bg is greater than the of number block group | ||
7 | descriptor blocks, then reading or writing the block group descriptors | ||
8 | will end up overruning the memory buffer allocated for the | ||
9 | descriptors. Fix this by limiting first_meta_bg to no more than | ||
10 | fs->desc_blocks. This doesn't correct the bad s_first_meta_bg value, | ||
11 | but it avoids causing the e2fsprogs userspace programs from | ||
12 | potentially crashing. | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | CVE: CVE-2015-0247 | ||
16 | |||
17 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | ||
18 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
19 | |||
20 | diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c | ||
21 | index 4599eef..1f99113 100644 | ||
22 | --- a/lib/ext2fs/closefs.c | ||
23 | +++ b/lib/ext2fs/closefs.c | ||
24 | @@ -344,9 +344,11 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags) | ||
25 | * superblocks and group descriptors. | ||
26 | */ | ||
27 | group_ptr = (char *) group_shadow; | ||
28 | - if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) | ||
29 | + if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { | ||
30 | old_desc_blocks = fs->super->s_first_meta_bg; | ||
31 | - else | ||
32 | + if (old_desc_blocks > fs->super->s_first_meta_bg) | ||
33 | + old_desc_blocks = fs->desc_blocks; | ||
34 | + } else | ||
35 | old_desc_blocks = fs->desc_blocks; | ||
36 | |||
37 | ext2fs_numeric_progress_init(fs, &progress, NULL, | ||
38 | diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c | ||
39 | index a1a3517..ba501e6 100644 | ||
40 | --- a/lib/ext2fs/openfs.c | ||
41 | +++ b/lib/ext2fs/openfs.c | ||
42 | @@ -378,9 +378,11 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, | ||
43 | #ifdef WORDS_BIGENDIAN | ||
44 | groups_per_block = EXT2_DESC_PER_BLOCK(fs->super); | ||
45 | #endif | ||
46 | - if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) | ||
47 | + if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { | ||
48 | first_meta_bg = fs->super->s_first_meta_bg; | ||
49 | - else | ||
50 | + if (first_meta_bg > fs->desc_blocks) | ||
51 | + first_meta_bg = fs->desc_blocks; | ||
52 | + } else | ||
53 | first_meta_bg = fs->desc_blocks; | ||
54 | if (first_meta_bg) { | ||
55 | retval = io_channel_read_blk(fs->io, group_block + | ||
56 | -- | ||
57 | cgit v0.10.2 | ||
58 | |||