From b394039686890efda61c37c6ec0cc637cf539658 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 29 Jul 2019 22:36:47 +0200
Subject: [PATCH] [arm64] compat: Provide definition for COMPAT_SIGMINSTKSZ
 (Closes: #904385).

---
 debian/changelog                              |  4 ++
 ...vide-definition-for-COMPAT_SIGMINSTK.patch | 38 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 43 insertions(+)
 create mode 100644 debian/patches/bugfix/arm64/arm64-compat-Provide-definition-for-COMPAT_SIGMINSTK.patch

diff --git a/debian/changelog b/debian/changelog
index 8efcd9df3..7810c5bdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ linux (4.19.37-6) UNRELEASED; urgency=medium
   * rtc-s35390a: backport fix to make hwclock able to read the time
     (Closes: #932845)
 
+  [ Aurelien Jarno ]
+  * [arm64] compat: Provide definition for COMPAT_SIGMINSTKSZ (Closes:
+    #904385).
+
  -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 23 Jun 2019 16:15:17 +0200
 
 linux (4.19.37-5+deb10u1) buster-security; urgency=high
diff --git a/debian/patches/bugfix/arm64/arm64-compat-Provide-definition-for-COMPAT_SIGMINSTK.patch b/debian/patches/bugfix/arm64/arm64-compat-Provide-definition-for-COMPAT_SIGMINSTK.patch
new file mode 100644
index 000000000..bf6ffcf09
--- /dev/null
+++ b/debian/patches/bugfix/arm64/arm64-compat-Provide-definition-for-COMPAT_SIGMINSTK.patch
@@ -0,0 +1,38 @@
+From: Will Deacon <will.deacon@arm.com>
+Date: Wed, 5 Sep 2018 15:34:43 +0100
+Subject: arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ
+Origin: https://git.kernel.org/linus/24951465cbd279f60b1fdc2421b3694405bcff42
+
+arch/arm/ defines a SIGMINSTKSZ of 2k, so we should use the same value
+for compat tasks.
+
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Dominik Brodowski <linux@dominikbrodowski.net>
+Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Al Viro <viro@zeniv.linux.org.uk>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Reviewed-by: Dave Martin <Dave.Martin@arm.com>
+Reported-by: Steve McIntyre <steve.mcintyre@arm.com>
+Tested-by: Steve McIntyre <93sam@debian.org>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+---
+ arch/arm64/include/asm/compat.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
+index 1a037b94eba1..cee28a05ee98 100644
+--- a/arch/arm64/include/asm/compat.h
++++ b/arch/arm64/include/asm/compat.h
+@@ -159,6 +159,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
+ }
+ 
+ #define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))
++#define COMPAT_MINSIGSTKSZ	2048
+ 
+ static inline void __user *arch_compat_alloc_user_space(long len)
+ {
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 1e32dbe26..7937888c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -85,6 +85,7 @@ bugfix/powerpc/powerpc-vdso-make-vdso32-installation-conditional-in.patch
 bugfix/mips/MIPS-scall64-o32-Fix-indirect-syscall-number-load.patch
 bugfix/mips/MIPS-Bounds-check-virt_addr_valid.patch
 bugfix/sparc64/sunhv-fix-device-naming-inconsistency-between-sunhv_console-and-sunhv_reg.patch
+bugfix/arm64/arm64-compat-Provide-definition-for-COMPAT_SIGMINSTK.patch
 
 # Arch features
 features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch