From 801d3d95a1cafc8e8b07bb12d96cac387dfa78bd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 13 Mar 2017 16:29:29 +0800 Subject: [PATCH] 4.4-stable patches added patches: drivers-hv-turn-off-write-permission-on-the-hypercall-page.patch fat-fix-using-uninitialized-fields-of-fat_inode-fsinfo_inode.patch --- ...ite-permission-on-the-hypercall-page.patch | 33 ++++++++++ ...zed-fields-of-fat_inode-fsinfo_inode.patch | 63 +++++++++++++++++++ queue-4.4/series | 2 + 3 files changed, 98 insertions(+) create mode 100644 queue-4.4/drivers-hv-turn-off-write-permission-on-the-hypercall-page.patch create mode 100644 queue-4.4/fat-fix-using-uninitialized-fields-of-fat_inode-fsinfo_inode.patch diff --git a/queue-4.4/drivers-hv-turn-off-write-permission-on-the-hypercall-page.patch b/queue-4.4/drivers-hv-turn-off-write-permission-on-the-hypercall-page.patch new file mode 100644 index 00000000000..1e86f35fa23 --- /dev/null +++ b/queue-4.4/drivers-hv-turn-off-write-permission-on-the-hypercall-page.patch @@ -0,0 +1,33 @@ +From 372b1e91343e657a7cc5e2e2bcecd5140ac28119 Mon Sep 17 00:00:00 2001 +From: "K. Y. Srinivasan" +Date: Wed, 8 Feb 2017 18:30:56 -0700 +Subject: drivers: hv: Turn off write permission on the hypercall page + +From: K. Y. Srinivasan + +commit 372b1e91343e657a7cc5e2e2bcecd5140ac28119 upstream. + +The hypercall page only needs to be executable but currently it is setup to +be writable as well. Fix the issue. + +Signed-off-by: K. Y. Srinivasan +Acked-by: Kees Cook +Reported-by: Stephen Hemminger +Tested-by: Stephen Hemminger +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hv/hv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/hv/hv.c ++++ b/drivers/hv/hv.c +@@ -219,7 +219,7 @@ int hv_init(void) + /* See if the hypercall page is already set */ + rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); + +- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC); ++ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX); + + if (!virtaddr) + goto cleanup; diff --git a/queue-4.4/fat-fix-using-uninitialized-fields-of-fat_inode-fsinfo_inode.patch b/queue-4.4/fat-fix-using-uninitialized-fields-of-fat_inode-fsinfo_inode.patch new file mode 100644 index 00000000000..b488709e920 --- /dev/null +++ b/queue-4.4/fat-fix-using-uninitialized-fields-of-fat_inode-fsinfo_inode.patch @@ -0,0 +1,63 @@ +From c0d0e351285161a515396b7b1ee53ec9ffd97e3c Mon Sep 17 00:00:00 2001 +From: OGAWA Hirofumi +Date: Thu, 9 Mar 2017 16:17:37 -0800 +Subject: fat: fix using uninitialized fields of fat_inode/fsinfo_inode + +From: OGAWA Hirofumi + +commit c0d0e351285161a515396b7b1ee53ec9ffd97e3c upstream. + +Recently fallocate patch was merged and it uses +MSDOS_I(inode)->mmu_private at fat_evict_inode(). However, +fat_inode/fsinfo_inode that was introduced in past didn't initialize +MSDOS_I(inode) properly. + +With those combinations, it became the cause of accessing random entry +in FAT area. + +Link: http://lkml.kernel.org/r/87pohrj4i8.fsf@mail.parknet.co.jp +Signed-off-by: OGAWA Hirofumi +Reported-by: Moreno Bartalucci +Tested-by: Moreno Bartalucci +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/fat/inode.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/fs/fat/inode.c ++++ b/fs/fat/inode.c +@@ -1269,6 +1269,16 @@ out: + return 0; + } + ++static void fat_dummy_inode_init(struct inode *inode) ++{ ++ /* Initialize this dummy inode to work as no-op. */ ++ MSDOS_I(inode)->mmu_private = 0; ++ MSDOS_I(inode)->i_start = 0; ++ MSDOS_I(inode)->i_logstart = 0; ++ MSDOS_I(inode)->i_attrs = 0; ++ MSDOS_I(inode)->i_pos = 0; ++} ++ + static int fat_read_root(struct inode *inode) + { + struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb); +@@ -1713,12 +1723,13 @@ int fat_fill_super(struct super_block *s + fat_inode = new_inode(sb); + if (!fat_inode) + goto out_fail; +- MSDOS_I(fat_inode)->i_pos = 0; ++ fat_dummy_inode_init(fat_inode); + sbi->fat_inode = fat_inode; + + fsinfo_inode = new_inode(sb); + if (!fsinfo_inode) + goto out_fail; ++ fat_dummy_inode_init(fsinfo_inode); + fsinfo_inode->i_ino = MSDOS_FSINFO_INO; + sbi->fsinfo_inode = fsinfo_inode; + insert_inode_hash(fsinfo_inode); diff --git a/queue-4.4/series b/queue-4.4/series index a03780ce7c5..2114c92a113 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -32,3 +32,5 @@ drm-atomic-fix-an-error-code-in-mode_fixup.patch fakelb-fix-schedule-while-atomic.patch drm-i915-dsi-do-not-clear-dpounit_clock_gate_disable-from-vlv_init_display_clock_gating.patch libceph-use-bug-instead-of-bug_on-1.patch +fat-fix-using-uninitialized-fields-of-fat_inode-fsinfo_inode.patch +drivers-hv-turn-off-write-permission-on-the-hypercall-page.patch -- 2.47.3