diff mbox series

arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ

Message ID 20190730092547.1284-1-will@kernel.org
State New
Headers show
Series arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ | expand

Commit Message

Will Deacon July 30, 2019, 9:25 a.m. UTC 
From: Will Deacon <will.deacon@arm.com>


[ Upstream commit 24951465cbd279f60b1fdc2421b3694405bcff42 ]

arch/arm/ defines a SIGMINSTKSZ of 2k, so we should use the same value
for compat tasks.

Cc: <stable@vger.kernel.org> # 4.9+
Cc: Aurelien Jarno <aurelien@aurel32.net>
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>

---

Aurelien points out that this didn't get selected for -stable despite its
counterpart (22839869f21a ("signal: Introduce COMPAT_SIGMINSTKSZ for use
in compat_sys_sigaltstack")) being backported to 4.9. Oops.

 arch/arm64/include/asm/compat.h | 1 +
 1 file changed, 1 insertion(+)

-- 
2.11.0

Comments

Aurelien Jarno July 31, 2019, 10 a.m. UTC | #1 
On 2019-07-31 11:47, Greg KH wrote:
> On Tue, Jul 30, 2019 at 11:42:26AM +0200, Greg KH wrote:

> > On Tue, Jul 30, 2019 at 10:39:38AM +0100, Will Deacon wrote:

> > > On Tue, Jul 30, 2019 at 11:37:13AM +0200, Greg KH wrote:

> > > > On Tue, Jul 30, 2019 at 10:25:47AM +0100, Will Deacon wrote:

> > > > > From: Will Deacon <will.deacon@arm.com>

> > > > > 

> > > > > [ Upstream commit 24951465cbd279f60b1fdc2421b3694405bcff42 ]

> > > > > 

> > > > > arch/arm/ defines a SIGMINSTKSZ of 2k, so we should use the same value

> > > > > for compat tasks.

> > > > > 

> > > > > Cc: <stable@vger.kernel.org> # 4.9+

> > > > > Cc: Aurelien Jarno <aurelien@aurel32.net>

> > > > > 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>

> > > > > ---

> > > > > 

> > > > > Aurelien points out that this didn't get selected for -stable despite its

> > > > > counterpart (22839869f21a ("signal: Introduce COMPAT_SIGMINSTKSZ for use

> > > > > in compat_sys_sigaltstack")) being backported to 4.9. Oops.

> > > > 

> > > > So this needs to go into 4.9.y, 4.14.y, and 4.19.y?

> > > 

> > > Yes, please.

> > 

> > Thanks, will do after this next round of kernels goes out.

> 

> Now queued up, thanks.

> 


Thanks!

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@aurel32.net                 http://www.aurel32.net
diff mbox series

Patch

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)
 {