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

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

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

Pull x86 SMAP fixes from Ingo Molnar:
 "Fixes for Intel SMAP support, to fix SIGSEGVs during bootup"

* 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Introduce [compat_]save_altstack_ex() to unbreak x86 SMAP
  x86, smap: Handle csum_partial_copy_*_user()
parents b20c99eb bd1c149a

arch/x86/ia32/ia32_signal.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -457,7 +457,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, 
		else

		else

			put_user_ex(0, &frame->uc.uc_flags);

			put_user_ex(0, &frame->uc.uc_flags);

		put_user_ex(0, &frame->uc.uc_link);

		put_user_ex(0, &frame->uc.uc_link);

		err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp);

		compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);





		if (ksig->ka.sa.sa_flags & SA_RESTORER)

		if (ksig->ka.sa.sa_flags & SA_RESTORER)

			restorer = ksig->ka.sa.sa_restorer;

			restorer = ksig->ka.sa.sa_restorer;

arch/x86/include/asm/checksum_32.h

+17 −5
Original line number Original line Diff line number Diff line
@@ -49,9 +49,15 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src, 
						 int len, __wsum sum,

						 int len, __wsum sum,

						 int *err_ptr)

						 int *err_ptr)

{

{

	__wsum ret;



	might_sleep();

	might_sleep();

	return csum_partial_copy_generic((__force void *)src, dst,

	stac();

	ret = csum_partial_copy_generic((__force void *)src, dst,

					len, sum, err_ptr, NULL);

					len, sum, err_ptr, NULL);

	clac();



	return ret;

}

}





/*

/*
@@ -176,10 +182,16 @@ static inline __wsum csum_and_copy_to_user(const void *src, 
					   int len, __wsum sum,

					   int len, __wsum sum,

					   int *err_ptr)

					   int *err_ptr)

{

{

	__wsum ret;



	might_sleep();

	might_sleep();

	if (access_ok(VERIFY_WRITE, dst, len))

	if (access_ok(VERIFY_WRITE, dst, len)) {

		return csum_partial_copy_generic(src, (__force void *)dst,

		stac();

		ret = csum_partial_copy_generic(src, (__force void *)dst,

						len, sum, NULL, err_ptr);

						len, sum, NULL, err_ptr);

		clac();

		return ret;

	}





	if (len)

	if (len)

		*err_ptr = -EFAULT;

		*err_ptr = -EFAULT;

arch/x86/kernel/signal.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -358,7 +358,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, 
		else

		else

			put_user_ex(0, &frame->uc.uc_flags);

			put_user_ex(0, &frame->uc.uc_flags);

		put_user_ex(0, &frame->uc.uc_link);

		put_user_ex(0, &frame->uc.uc_link);

		err |= __save_altstack(&frame->uc.uc_stack, regs->sp);

		save_altstack_ex(&frame->uc.uc_stack, regs->sp);





		/* Set up to return from userspace.  */

		/* Set up to return from userspace.  */

		restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);

		restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
@@ -423,7 +423,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, 
		else

		else

			put_user_ex(0, &frame->uc.uc_flags);

			put_user_ex(0, &frame->uc.uc_flags);

		put_user_ex(0, &frame->uc.uc_link);

		put_user_ex(0, &frame->uc.uc_link);

		err |= __save_altstack(&frame->uc.uc_stack, regs->sp);

		save_altstack_ex(&frame->uc.uc_stack, regs->sp);





		/* Set up to return from userspace.  If provided, use a stub

		/* Set up to return from userspace.  If provided, use a stub

		   already in userspace.  */

		   already in userspace.  */
@@ -490,7 +490,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig, 
		else

		else

			put_user_ex(0, &frame->uc.uc_flags);

			put_user_ex(0, &frame->uc.uc_flags);

		put_user_ex(0, &frame->uc.uc_link);

		put_user_ex(0, &frame->uc.uc_link);

		err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp);

		compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);

		put_user_ex(0, &frame->uc.uc__pad0);

		put_user_ex(0, &frame->uc.uc__pad0);





		if (ksig->ka.sa.sa_flags & SA_RESTORER) {

		if (ksig->ka.sa.sa_flags & SA_RESTORER) {

arch/x86/lib/csum-wrappers_64.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */

 */

#include <asm/checksum.h>

#include <asm/checksum.h>

#include <linux/module.h>

#include <linux/module.h>

#include <asm/smap.h>





/**

/**

 * csum_partial_copy_from_user - Copy and checksum from user space.

 * csum_partial_copy_from_user - Copy and checksum from user space.
@@ -52,8 +53,10 @@ csum_partial_copy_from_user(const void __user *src, void *dst, 
			len -= 2;

			len -= 2;

		}

		}

	}

	}

	stac();

	isum = csum_partial_copy_generic((__force const void *)src,

	isum = csum_partial_copy_generic((__force const void *)src,

				dst, len, isum, errp, NULL);

				dst, len, isum, errp, NULL);

	clac();

	if (unlikely(*errp))

	if (unlikely(*errp))

		goto out_err;

		goto out_err;
@@ -82,6 +85,8 @@ __wsum 
csum_partial_copy_to_user(const void *src, void __user *dst,

csum_partial_copy_to_user(const void *src, void __user *dst,

			  int len, __wsum isum, int *errp)

			  int len, __wsum isum, int *errp)

{

{

	__wsum ret;



	might_sleep();

	might_sleep();





	if (unlikely(!access_ok(VERIFY_WRITE, dst, len))) {

	if (unlikely(!access_ok(VERIFY_WRITE, dst, len))) {
@@ -105,8 +110,11 @@ csum_partial_copy_to_user(const void *src, void __user *dst, 
	}

	}





	*errp = 0;

	*errp = 0;

	return csum_partial_copy_generic(src, (void __force *)dst,

	stac();

	ret = csum_partial_copy_generic(src, (void __force *)dst,

					len, isum, NULL, errp);

					len, isum, NULL, errp);

	clac();

	return ret;

}

}

EXPORT_SYMBOL(csum_partial_copy_to_user);

EXPORT_SYMBOL(csum_partial_copy_to_user);

include/linux/compat.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -669,6 +669,13 @@ asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr, 




int compat_restore_altstack(const compat_stack_t __user *uss);

int compat_restore_altstack(const compat_stack_t __user *uss);

int __compat_save_altstack(compat_stack_t __user *, unsigned long);

int __compat_save_altstack(compat_stack_t __user *, unsigned long);

#define compat_save_altstack_ex(uss, sp) do { \

	compat_stack_t __user *__uss = uss; \

	struct task_struct *t = current; \

	put_user_ex(ptr_to_compat((void __user *)t->sas_ss_sp), &__uss->ss_sp); \

	put_user_ex(sas_ss_flags(sp), &__uss->ss_flags); \

	put_user_ex(t->sas_ss_size, &__uss->ss_size); \

} while (0);





asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,

asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,

						 struct compat_timespec __user *interval);

						 struct compat_timespec __user *interval);