aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-08-15 21:50:09 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-08-15 22:42:26 +0200
commit033472e1bd9cdab250d16802a8b402dad0bb3dda (patch)
tree2a73a7b8ba1b5e49d6e0db0ee90c416811ffec3a /target/linux
parentbfc9a4401bbef4f4fe2c4db4abc95205896ece0f (diff)
downloadupstream-033472e1bd9cdab250d16802a8b402dad0bb3dda.tar.gz
upstream-033472e1bd9cdab250d16802a8b402dad0bb3dda.tar.bz2
upstream-033472e1bd9cdab250d16802a8b402dad0bb3dda.zip
kernel: bump kernel 4.9 to version 4.9.120
The following patch was integrated upstream: * target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch This fixes tries to work around the following security problems: * CVE-2018-3620 L1 Terminal Fault OS, SMM related aspects * CVE-2018-3646 L1 Terminal Fault Virtualization related aspects Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch65
1 files changed, 0 insertions, 65 deletions
diff --git a/target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch b/target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch
deleted file mode 100644
index 914dddf726..0000000000
--- a/target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 5012284700775a4e6e3fbe7eac4c543c4874b559 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Sat, 28 Jul 2018 08:12:04 -0400
-Subject: [PATCH] ext4: fix check to prevent initializing reserved inodes
-
-Commit 8844618d8aa7: "ext4: only look at the bg_flags field if it is
-valid" will complain if block group zero does not have the
-EXT4_BG_INODE_ZEROED flag set. Unfortunately, this is not correct,
-since a freshly created file system has this flag cleared. It gets
-almost immediately after the file system is mounted read-write --- but
-the following somewhat unlikely sequence will end up triggering a
-false positive report of a corrupted file system:
-
- mkfs.ext4 /dev/vdc
- mount -o ro /dev/vdc /vdc
- mount -o remount,rw /dev/vdc
-
-Instead, when initializing the inode table for block group zero, test
-to make sure that itable_unused count is not too large, since that is
-the case that will result in some or all of the reserved inodes
-getting cleared.
-
-This fixes the failures reported by Eric Whiteney when running
-generic/230 and generic/231 in the the nojournal test case.
-
-Fixes: 8844618d8aa7 ("ext4: only look at the bg_flags field if it is valid")
-Reported-by: Eric Whitney <enwlinux@gmail.com>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- fs/ext4/ialloc.c | 5 ++++-
- fs/ext4/super.c | 8 +-------
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -1316,7 +1316,10 @@ int ext4_init_inode_table(struct super_b
- ext4_itable_unused_count(sb, gdp)),
- sbi->s_inodes_per_block);
-
-- if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group)) {
-+ if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group) ||
-+ ((group == 0) && ((EXT4_INODES_PER_GROUP(sb) -
-+ ext4_itable_unused_count(sb, gdp)) <
-+ EXT4_FIRST_INO(sb)))) {
- ext4_error(sb, "Something is wrong with group %u: "
- "used itable blocks: %d; "
- "itable unused count: %u",
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -3031,14 +3031,8 @@ static ext4_group_t ext4_has_uninit_itab
- if (!gdp)
- continue;
-
-- if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED))
-- continue;
-- if (group != 0)
-+ if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)))
- break;
-- ext4_error(sb, "Inode table for bg 0 marked as "
-- "needing zeroing");
-- if (sb->s_flags & MS_RDONLY)
-- return ngroups;
- }
-
- return group;