Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/dumpstack: Rename thread_struct::sig_on_uaccess_error to sig_on_uaccess_err

Rename it to match the thread_struct::uaccess_err pattern and also
because it was too long.

Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

+7 -7
+5 -5
arch/x86/entry/vsyscall/vsyscall_64.c
··· 96 96 { 97 97 /* 98 98 * XXX: if access_ok, get_user, and put_user handled 99 - * sig_on_uaccess_error, this could go away. 99 + * sig_on_uaccess_err, this could go away. 100 100 */ 101 101 102 102 if (!access_ok(VERIFY_WRITE, (void __user *)ptr, size)) { ··· 125 125 struct task_struct *tsk; 126 126 unsigned long caller; 127 127 int vsyscall_nr, syscall_nr, tmp; 128 - int prev_sig_on_uaccess_error; 128 + int prev_sig_on_uaccess_err; 129 129 long ret; 130 130 131 131 /* ··· 221 221 * With a real vsyscall, page faults cause SIGSEGV. We want to 222 222 * preserve that behavior to make writing exploits harder. 223 223 */ 224 - prev_sig_on_uaccess_error = current->thread.sig_on_uaccess_error; 225 - current->thread.sig_on_uaccess_error = 1; 224 + prev_sig_on_uaccess_err = current->thread.sig_on_uaccess_err; 225 + current->thread.sig_on_uaccess_err = 1; 226 226 227 227 ret = -EFAULT; 228 228 switch (vsyscall_nr) { ··· 243 243 break; 244 244 } 245 245 246 - current->thread.sig_on_uaccess_error = prev_sig_on_uaccess_error; 246 + current->thread.sig_on_uaccess_err = prev_sig_on_uaccess_err; 247 247 248 248 check_fault: 249 249 if (ret == -EFAULT) {
+1 -1
arch/x86/include/asm/processor.h
··· 419 419 /* Max allowed port in the bitmap, in bytes: */ 420 420 unsigned io_bitmap_max; 421 421 422 - unsigned int sig_on_uaccess_error:1; 422 + unsigned int sig_on_uaccess_err:1; 423 423 unsigned int uaccess_err:1; /* uaccess failed */ 424 424 425 425 /* Floating point and extended processor state */
+1 -1
arch/x86/mm/fault.c
··· 737 737 * In this case we need to make sure we're not recursively 738 738 * faulting through the emulate_vsyscall() logic. 739 739 */ 740 - if (current->thread.sig_on_uaccess_error && signal) { 740 + if (current->thread.sig_on_uaccess_err && signal) { 741 741 tsk->thread.trap_nr = X86_TRAP_PF; 742 742 tsk->thread.error_code = error_code | PF_USER; 743 743 tsk->thread.cr2 = address;