Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aad9269 authored by Gerald Schaefer's avatar Gerald Schaefer Committed by Greg Kroah-Hartman
Browse files

s390/mm: fix address space detection in exception handling 



commit 962f0af83c239c0aef05639631e871c874b00f99 upstream.

Commit 0aaba41b ("s390: remove all code using the access register
mode") removed access register mode from the kernel, and also from the
address space detection logic. However, user space could still switch
to access register mode (trans_exc_code == 1), and exceptions in that
mode would not be correctly assigned.

Fix this by adding a check for trans_exc_code == 1 to get_fault_type(),
and remove the wrong comment line before that function.

Fixes: 0aaba41b ("s390: remove all code using the access register mode")
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: <stable@vger.kernel.org> # v4.15+
Signed-off-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7737eff0

arch/s390/mm/fault.c

+4 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ void bust_spinlocks(int yes) 


/*

 * Find out which address space caused the exception.

 * Access register mode is impossible, ignore space == 3.

 */

static inline enum fault_type get_fault_type(struct pt_regs *regs)

{
@@ -132,6 +131,10 @@ static inline enum fault_type get_fault_type(struct pt_regs *regs) 
		}

		return VDSO_FAULT;

	}

	if (trans_exc_code == 1) {

		/* access register mode, not used in the kernel */

		return USER_FAULT;

	}

	/* home space exception -> access via kernel ASCE */

	return KERNEL_FAULT;

}