aboutsummaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2017-02-24 07:43:51 +0100
committerMister Oyster <oysterized@gmail.com>2017-07-04 11:51:38 +0200
commitf61046abec83b5341414e0582e01521c34ebff5f (patch)
tree5e9e093c1fe3fc972b86f3400e0a0bba3685b64e /arch/s390
parentcd81bd92fbd18b40b4b03aa1e77f72f234a51155 (diff)
s390: TASK_SIZE for kernel threads
commit fb94a687d96c570d46332a4a890f1dcb7310e643 upstream. Return a sensible value if TASK_SIZE if called from a kernel thread. This gets us around an issue with copy_mount_options that does a magic size calculation "TASK_SIZE - (unsigned long)data" while in a kernel thread and data pointing to kernel space. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/processor.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 83c85c217..52ef30cfe 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -48,7 +48,8 @@ extern void execve_tail(void);
#else /* CONFIG_64BIT */
-#define TASK_SIZE_OF(tsk) ((tsk)->mm->context.asce_limit)
+#define TASK_SIZE_OF(tsk) ((tsk)->mm ? \
+ (tsk)->mm->context.asce_limit : TASK_MAX_SIZE)
#define TASK_UNMAPPED_BASE (test_thread_flag(TIF_31BIT) ? \
(1UL << 30) : (1UL << 41))
#define TASK_SIZE TASK_SIZE_OF(current)