[linux] 02/02: [!x86] Adjust "mmap: Add an exception ... for Hotspot JVM ..." to fix FTBFS

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch wheezy-security
in repository linux.

commit 161c3b2e15d15254acd0db981c80167c5a54d23e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Dec 10 04:03:59 2017 +0000

    [!x86] Adjust "mmap: Add an exception ... for Hotspot JVM ..." to fix FTBFS
    
    The IS_ENABLED() macro wasn't quite as magical in 3.2, and it only
    works for symbols defined in a Kconfig file that is included by the
    current architecture.  Use #ifdef CONFIG_X86 instead.
---
 debian/changelog                                                   | 7 +++++++
 .../mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch   | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 840e386..7949c4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (3.2.96-2) wheezy-security; urgency=high
+
+  * [!x86] Adjust "mmap: Add an exception to the stack gap for Hotspot JVM
+    compatibility" to fix FTBFS
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 10 Dec 2017 04:02:42 +0000
+
 linux (3.2.96-1) wheezy-security; urgency=high
 
   * New upstream stable update:
diff --git a/debian/patches/bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch b/debian/patches/bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch
index 78a6c1b..57181b6 100644
--- a/debian/patches/bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch
+++ b/debian/patches/bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch
@@ -26,7 +26,7 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -1788,6 +1788,16 @@ int expand_downwards(struct vm_area_stru
+@@ -1788,6 +1788,18 @@ int expand_downwards(struct vm_area_stru
  	/* Check that both stack segments have the same anon_vma? */
  	if (prev && !(prev->vm_flags & VM_GROWSDOWN) &&
  			(prev->vm_flags & (VM_WRITE|VM_READ|VM_EXEC))) {
@@ -34,12 +34,14 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 +		 * bwh: Reduce the stack guard gap if this looks like
 +		 * Hotspot JVM craziness - see Debian bug #865303
 +		 */
-+		if (IS_ENABLED(CONFIG_X86) && (prev->vm_flags & VM_FIXED) &&
++#ifdef CONFIG_X86
++		if ((prev->vm_flags & VM_FIXED) &&
 +		    prev->vm_end - prev->vm_start == PAGE_SIZE) {
 +			if (address - prev->vm_end <
 +			    min(stack_guard_gap, 4UL << PAGE_SHIFT))
 +				return -ENOMEM;
 +		} else
++#endif
  		if (address - prev->vm_end < stack_guard_gap)
  			return -ENOMEM;
  	}

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