Commit 91174391 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 Thomas Gleixner:
 "A set of small fixes for x86:

   - fix locking in RDT to prevent memory leaks and freeing in use
     memory

   - prevent setting invalid values for vdso32_enabled which cause
     inconsistencies for user space resulting in application crashes.

   - plug a race in the vdso32 code between fork and sysctl which causes
     inconsistencies for user space resulting in application crashes.

   - make MPX signal delivery work in compat mode

   - make the dmesg output of traps and faults readable again"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel_rdt: Fix locking in rdtgroup_schemata_write()
  x86/debug: Fix the printk() debug output of signal_fault(), do_trap() and do_general_protection()
  x86/vdso: Plug race between mapping and ELF header setup
  x86/vdso: Ensure vdso32_enabled gets set to valid values only
  x86/signals: Fix lower/upper bound reporting in compat siginfo
parents 07c7016d 7f00f388

arch/x86/entry/vdso/vdso32-setup.c

+9 −2
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ static int __init vdso32_setup(char *s) 
{

	vdso32_enabled = simple_strtoul(s, NULL, 0);



	if (vdso32_enabled > 1)

	if (vdso32_enabled > 1) {

		pr_warn("vdso32 values other than 0 and 1 are no longer allowed; vdso disabled\n");

		vdso32_enabled = 0;

	}



	return 1;

}
@@ -62,13 +64,18 @@ subsys_initcall(sysenter_setup); 
/* Register vsyscall32 into the ABI table */

#include <linux/sysctl.h>



static const int zero;

static const int one = 1;



static struct ctl_table abi_table2[] = {

	{

		.procname	= "vsyscall32",

		.data		= &vdso32_enabled,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= (int *)&zero,

		.extra2		= (int *)&one,

	},

	{}

};

arch/x86/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ struct task_struct; 


#define	ARCH_DLINFO_IA32						\

do {									\

	if (vdso32_enabled) {						\

	if (VDSO_CURRENT_BASE) {					\

		NEW_AUX_ENT(AT_SYSINFO,	VDSO_ENTRY);			\

		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_CURRENT_BASE);	\

	}								\

arch/x86/kernel/cpu/intel_rdt_schemata.c

+1 −1
Original line number Diff line number Diff line
@@ -200,11 +200,11 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of, 
	}



out:

	rdtgroup_kn_unlock(of->kn);

	for_each_enabled_rdt_resource(r) {

		kfree(r->tmp_cbms);

		r->tmp_cbms = NULL;

	}

	rdtgroup_kn_unlock(of->kn);

	return ret ?: nbytes;

}

arch/x86/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where) 
		       task_pid_nr(current) > 1 ? KERN_INFO : KERN_EMERG,

		       me->comm, me->pid, where, frame,

		       regs->ip, regs->sp, regs->orig_ax);

		print_vma_addr(" in ", regs->ip);

		print_vma_addr(KERN_CONT " in ", regs->ip);

		pr_cont("\n");

	}

arch/x86/kernel/signal_compat.c

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from, 


				if (from->si_signo == SIGSEGV) {

					if (from->si_code == SEGV_BNDERR) {

						compat_uptr_t lower = (unsigned long)&to->si_lower;

						compat_uptr_t upper = (unsigned long)&to->si_upper;

						compat_uptr_t lower = (unsigned long)from->si_lower;

						compat_uptr_t upper = (unsigned long)from->si_upper;

						put_user_ex(lower, &to->si_lower);

						put_user_ex(upper, &to->si_upper);

					}

CRA Git | Maintained and supported by SUSTech CRA and CCSE