[linux] 03/11: drop bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch stretch
in repository linux.

commit a3e27d96afbed3174ac1d9421d8ef97fa6d8de6e
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Thu Feb 1 21:20:37 2018 +0100

    drop bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch
---
 debian/changelog                                   |  1 +
 ...o-not-blow-on-prot_none-map_fixed-holes-i.patch | 58 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd8ef85..e0fca7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -859,6 +859,7 @@ linux (4.9.79-1) UNRELEASED; urgency=medium
     - bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
     - bugfix/all/kvm-fix-stack-out-of-bounds-read-in-write_mmio.patch
     - bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
+    - bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch
   * bpf: avoid ABI change in 4.9.77.
   * Ignore ABI change for cpu_tlbstate (symbol not exported _GPL anymore)
   * sched/rt: Avoid ABI change in 4.9.66.
diff --git a/debian/patches/bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch b/debian/patches/bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch
deleted file mode 100644
index facaaa0..0000000
--- a/debian/patches/bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Michal Hocko <mhocko at suse.com>
-Date: Mon, 10 Jul 2017 15:49:51 -0700
-Subject: mm/mmap.c: do not blow on PROT_NONE MAP_FIXED holes in the stack
-Origin: https://git.kernel.org/linus/561b5e0709e4a248c67d024d4d94b6e31e3edf2f
-Bug-Debian: https://bugs.debian.org/865416
-
-Commit 1be7107fbe18 ("mm: larger stack guard gap, between vmas") has
-introduced a regression in some rust and Java environments which are
-trying to implement their own stack guard page.  They are punching a new
-MAP_FIXED mapping inside the existing stack Vma.
-
-This will confuse expand_{downwards,upwards} into thinking that the
-stack expansion would in fact get us too close to an existing non-stack
-vma which is a correct behavior wrt safety.  It is a real regression on
-the other hand.
-
-Let's work around the problem by considering PROT_NONE mapping as a part
-of the stack.  This is a gros hack but overflowing to such a mapping
-would trap anyway an we only can hope that usespace knows what it is
-doing and handle it propely.
-
-Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas")
-Link: http://lkml.kernel.org/r/20170705182849.GA18027@dhcp22.suse.cz
-Signed-off-by: Michal Hocko <mhocko at suse.com>
-Debugged-by: Vlastimil Babka <vbabka at suse.cz>
-Cc: Ben Hutchings <ben at decadent.org.uk>
-Cc: Willy Tarreau <w at 1wt.eu>
-Cc: Oleg Nesterov <oleg at redhat.com>
-Cc: Rik van Riel <riel at redhat.com>
-Cc: Hugh Dickins <hughd at google.com>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
----
- mm/mmap.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -2240,7 +2240,8 @@ int expand_upwards(struct vm_area_struct
- 		gap_addr = TASK_SIZE;
- 
- 	next = vma->vm_next;
--	if (next && next->vm_start < gap_addr) {
-+	if (next && next->vm_start < gap_addr &&
-+			(next->vm_flags & (VM_WRITE|VM_READ|VM_EXEC))) {
- 		if (!(next->vm_flags & VM_GROWSUP))
- 			return -ENOMEM;
- 		/* Check that both stack segments have the same anon_vma? */
-@@ -2324,7 +2325,8 @@ int expand_downwards(struct vm_area_stru
- 	if (gap_addr > address)
- 		return -ENOMEM;
- 	prev = vma->vm_prev;
--	if (prev && prev->vm_end > gap_addr) {
-+	if (prev && prev->vm_end > gap_addr &&
-+			(prev->vm_flags & (VM_WRITE|VM_READ|VM_EXEC))) {
- 		if (!(prev->vm_flags & VM_GROWSDOWN))
- 			return -ENOMEM;
- 		/* Check that both stack segments have the same anon_vma? */
diff --git a/debian/patches/series b/debian/patches/series
index 065b9fe..68cabb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -98,7 +98,6 @@ bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
 bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
 bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
-bugfix/all/mm-mmap.c-do-not-blow-on-prot_none-map_fixed-holes-i.patch
 bugfix/all/mm-mmap.c-expand_downwards-don-t-require-the-gap-if-.patch
 bugfix/x86/mmap-remember-the-map_fixed-flag-as-vm_fixed.patch
 bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git