diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 04:21:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 04:26:29 -0400 |
commit | 2a53ccbc0de1b1950aeedd24680f7eca65c86ff5 (patch) | |
tree | e380e7b656d27eb7ca796c63bf3ed31397168c8b /arch/x86/entry | |
parent | dfa9a942fd7951c8f333cf3f377dde51ebd21685 (diff) |
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>
Diffstat (limited to 'arch/x86/entry')
-rw-r--r-- | arch/x86/entry/vsyscall/vsyscall_64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 3aba2b043050..75fc719b7f31 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c | |||
@@ -96,7 +96,7 @@ static bool write_ok_or_segv(unsigned long ptr, size_t size) | |||
96 | { | 96 | { |
97 | /* | 97 | /* |
98 | * XXX: if access_ok, get_user, and put_user handled | 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 | if (!access_ok(VERIFY_WRITE, (void __user *)ptr, size)) { | 102 | if (!access_ok(VERIFY_WRITE, (void __user *)ptr, size)) { |
@@ -125,7 +125,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) | |||
125 | struct task_struct *tsk; | 125 | struct task_struct *tsk; |
126 | unsigned long caller; | 126 | unsigned long caller; |
127 | int vsyscall_nr, syscall_nr, tmp; | 127 | int vsyscall_nr, syscall_nr, tmp; |
128 | int prev_sig_on_uaccess_error; | 128 | int prev_sig_on_uaccess_err; |
129 | long ret; | 129 | long ret; |
130 | 130 | ||
131 | /* | 131 | /* |
@@ -221,8 +221,8 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) | |||
221 | * With a real vsyscall, page faults cause SIGSEGV. We want to | 221 | * With a real vsyscall, page faults cause SIGSEGV. We want to |
222 | * preserve that behavior to make writing exploits harder. | 222 | * preserve that behavior to make writing exploits harder. |
223 | */ | 223 | */ |
224 | prev_sig_on_uaccess_error = current->thread.sig_on_uaccess_error; | 224 | prev_sig_on_uaccess_err = current->thread.sig_on_uaccess_err; |
225 | current->thread.sig_on_uaccess_error = 1; | 225 | current->thread.sig_on_uaccess_err = 1; |
226 | 226 | ||
227 | ret = -EFAULT; | 227 | ret = -EFAULT; |
228 | switch (vsyscall_nr) { | 228 | switch (vsyscall_nr) { |
@@ -243,7 +243,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address) | |||
243 | break; | 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 | check_fault: | 248 | check_fault: |
249 | if (ret == -EFAULT) { | 249 | if (ret == -EFAULT) { |