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

Commit c98f5827 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Two fixes and a cleanup-fix, to the syscall entry code and to ptrace"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
  x86/ptrace: Stop setting TS_COMPAT in ptrace code
  x86/vdso: Error out if the vDSO isn't a valid DSO
parents 1630e843 f7d66562

arch/x86/entry/common.c

+5 −1
Original line number Diff line number Diff line
@@ -204,8 +204,12 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs) 
	 * handling, because syscall restart has a fixup for compat

	 * syscalls.  The fixup is exercised by the ptrace_syscall_32

	 * selftest.

	 *

	 * We also need to clear TS_REGS_POKED_I386: the 32-bit tracer

	 * special case only applies after poking regs and before the

	 * very next return to user mode.

	 */

	ti->status &= ~TS_COMPAT;

	ti->status &= ~(TS_COMPAT|TS_I386_REGS_POKED);

#endif



	user_enter_irqoff();

arch/x86/entry/syscalls/syscall_32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ 
# 285 sys_setaltroot

286	i386	add_key			sys_add_key

287	i386	request_key		sys_request_key

288	i386	keyctl			sys_keyctl

288	i386	keyctl			sys_keyctl			compat_sys_keyctl

289	i386	ioprio_set		sys_ioprio_set

290	i386	ioprio_get		sys_ioprio_get

291	i386	inotify_init		sys_inotify_init

arch/x86/entry/vdso/vdso2c.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 


	ELF(Phdr) *pt = (ELF(Phdr) *)(raw_addr + GET_LE(&hdr->e_phoff));



	if (hdr->e_type != ET_DYN)

		fail("input is not a shared object\n");



	/* Walk the segment table. */

	for (i = 0; i < GET_LE(&hdr->e_phnum); i++) {

		if (GET_LE(&pt[i].p_type) == PT_LOAD) {
@@ -49,6 +52,9 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 
	if (stripped_len < load_size)

		fail("stripped input is too short\n");



	if (!dyn)

		fail("input has no PT_DYNAMIC section -- your toolchain is buggy\n");



	/* Walk the dynamic table */

	for (i = 0; dyn + i < dyn_end &&

		     GET_LE(&dyn[i].d_tag) != DT_NULL; i++) {

arch/x86/include/asm/syscall.h

+1 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline long syscall_get_error(struct task_struct *task, 
	 * TS_COMPAT is set for 32-bit syscall entries and then

	 * remains set until we return to user mode.

	 */

	if (task_thread_info(task)->status & TS_COMPAT)

	if (task_thread_info(task)->status & (TS_COMPAT|TS_I386_REGS_POKED))

		/*

		 * Sign-extend the value so (int)-EFOO becomes (long)-EFOO

		 * and will match correctly in comparisons.
@@ -239,9 +239,6 @@ static inline int syscall_get_arch(void) 
	 * TS_COMPAT is set for 32-bit syscall entry and then

	 * remains set until we return to user mode.

	 *

	 * TIF_IA32 tasks should always have TS_COMPAT set at

	 * system call time.

	 *

	 * x32 tasks should be considered AUDIT_ARCH_X86_64.

	 */

	if (task_thread_info(current)->status & TS_COMPAT)

arch/x86/include/asm/thread_info.h

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ static inline unsigned long current_stack_pointer(void) 
 * have to worry about atomic accesses.

 */

#define TS_COMPAT		0x0002	/* 32bit syscall active (64BIT)*/

#ifdef CONFIG_COMPAT

#define TS_I386_REGS_POKED	0x0004	/* regs poked by 32-bit ptracer */

#endif



#ifndef __ASSEMBLY__