x86/uaccess: Move thread_info::uaccess_err and thread_info::sig_on_uaccess_err to...

[cascardo/linux.git] / arch / x86 / entry / vsyscall / vsyscall_64.c

diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c
index 174c254..3aba2b0 100644 (file)
--- a/arch/x86/entry/vsyscall/vsyscall_64.c
+++ b/arch/x86/entry/vsyscall/vsyscall_64.c
@@ -221,8 +221,8 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
         * With a real vsyscall, page faults cause SIGSEGV.  We want to
         * preserve that behavior to make writing exploits harder.
         */
-       prev_sig_on_uaccess_error = current_thread_info()->sig_on_uaccess_error;
-       current_thread_info()->sig_on_uaccess_error = 1;
+       prev_sig_on_uaccess_error = current->thread.sig_on_uaccess_error;
+       current->thread.sig_on_uaccess_error = 1;
 
        ret = -EFAULT;
        switch (vsyscall_nr) {
@@ -243,7 +243,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
                break;
        }
 
-       current_thread_info()->sig_on_uaccess_error = prev_sig_on_uaccess_error;
+       current->thread.sig_on_uaccess_error = prev_sig_on_uaccess_error;
 
 check_fault:
        if (ret == -EFAULT) {