Commit fa968ee2 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

s390/signal: set correct address space control 



If user space is running in primary mode it can switch to secondary
or access register mode, this is used e.g. in the clock_gettime code
of the vdso. If a signal is delivered to the user space process while
it has been running in access register mode the signal handler is
executed in access register mode as well which will result in a crash
most of the time.

Set the address space control bits in the PSW to the default for the
execution of the signal handler and make sure that the previous
address space control is restored on signal return. Take care
that user space can not switch to the kernel address space by
modifying the registers in the signal frame.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 77b67063

arch/s390/include/asm/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define PSW32_MASK_CC		0x00003000UL

#define PSW32_MASK_PM		0x00000f00UL



#define PSW32_MASK_USER		0x00003F00UL

#define PSW32_MASK_USER		0x0000FF00UL



#define PSW32_ADDR_AMODE	0x80000000UL

#define PSW32_ADDR_INSN		0x7FFFFFFFUL

arch/s390/include/uapi/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ typedef struct 
#define PSW_MASK_EA		0x00000000UL

#define PSW_MASK_BA		0x00000000UL



#define PSW_MASK_USER		0x00003F00UL

#define PSW_MASK_USER		0x0000FF00UL



#define PSW_ADDR_AMODE		0x80000000UL

#define PSW_ADDR_INSN		0x7FFFFFFFUL
@@ -269,7 +269,7 @@ typedef struct 
#define PSW_MASK_EA		0x0000000100000000UL

#define PSW_MASK_BA		0x0000000080000000UL



#define PSW_MASK_USER		0x00003F8180000000UL

#define PSW_MASK_USER		0x0000FF8180000000UL



#define PSW_ADDR_AMODE		0x0000000000000000UL

#define PSW_ADDR_INSN		0xFFFFFFFFFFFFFFFFUL

arch/s390/kernel/compat_signal.c

+12 −2
Original line number Diff line number Diff line
@@ -309,6 +309,10 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) 
	regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |

		(__u64)(regs32.psw.mask & PSW32_MASK_USER) << 32 |

		(__u64)(regs32.psw.addr & PSW32_ADDR_AMODE);

	/* Check for invalid user address space control. */

	if ((regs->psw.mask & PSW_MASK_ASC) >= (psw_kernel_bits & PSW_MASK_ASC))

		regs->psw.mask = (psw_user_bits & PSW_MASK_ASC) |

			(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (__u64)(regs32.psw.addr & PSW32_ADDR_INSN);

	for (i = 0; i < NUM_GPRS; i++)

		regs->gprs[i] = (__u64) regs32.gprs[i];
@@ -481,7 +485,10 @@ static int setup_frame32(int sig, struct k_sigaction *ka, 


	/* Set up registers for signal handler */

	regs->gprs[15] = (__force __u64) frame;

	regs->psw.mask |= PSW_MASK_BA;		/* force amode 31 */

	/* Force 31 bit amode and default user address space control. */

	regs->psw.mask = PSW_MASK_BA |

		(psw_user_bits & PSW_MASK_ASC) |

		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (__force __u64) ka->sa.sa_handler;



	regs->gprs[2] = map_signal(sig);
@@ -549,7 +556,10 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 


	/* Set up registers for signal handler */

	regs->gprs[15] = (__force __u64) frame;

	regs->psw.mask |= PSW_MASK_BA;		/* force amode 31 */

	/* Force 31 bit amode and default user address space control. */

	regs->psw.mask = PSW_MASK_BA |

		(psw_user_bits & PSW_MASK_ASC) |

		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (__u64) ka->sa.sa_handler;



	regs->gprs[2] = map_signal(sig);

arch/s390/kernel/signal.c

+12 −2
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs) 
	/* Use regs->psw.mask instead of psw_user_bits to preserve PER bit. */

	regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |

		(user_sregs.regs.psw.mask & PSW_MASK_USER);

	/* Check for invalid user address space control. */

	if ((regs->psw.mask & PSW_MASK_ASC) >= (psw_kernel_bits & PSW_MASK_ASC))

		regs->psw.mask = (psw_user_bits & PSW_MASK_ASC) |

			(regs->psw.mask & ~PSW_MASK_ASC);

	/* Check for invalid amode */

	if (regs->psw.mask & PSW_MASK_EA)

		regs->psw.mask |= PSW_MASK_BA;
@@ -273,7 +277,10 @@ static int setup_frame(int sig, struct k_sigaction *ka, 


	/* Set up registers for signal handler */

	regs->gprs[15] = (unsigned long) frame;

	regs->psw.mask |= PSW_MASK_EA | PSW_MASK_BA;	/* 64 bit amode */

	/* Force default amode and default user address space control. */

	regs->psw.mask = PSW_MASK_EA | PSW_MASK_BA |

		(psw_user_bits & PSW_MASK_ASC) |

		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;



	regs->gprs[2] = map_signal(sig);
@@ -346,7 +353,10 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 


	/* Set up registers for signal handler */

	regs->gprs[15] = (unsigned long) frame;

	regs->psw.mask |= PSW_MASK_EA | PSW_MASK_BA;	/* 64 bit amode */

	/* Force default amode and default user address space control. */

	regs->psw.mask = PSW_MASK_EA | PSW_MASK_BA |

		(psw_user_bits & PSW_MASK_ASC) |

		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;



	regs->gprs[2] = map_signal(sig);

CRA Git | Maintained and supported by SUSTech CRA and CCSE