The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     900ffe39fec908e0aa26a30612e43ebc7140db79
Gitweb:        
https://git.kernel.org/tip/900ffe39fec908e0aa26a30612e43ebc7140db79
Author:        Kees Cook <keesc...@chromium.org>
AuthorDate:    Sat, 19 Sep 2020 01:09:36 -07:00
Committer:     Borislav Petkov <b...@suse.de>
CommitterDate: Tue, 22 Sep 2020 18:24:46 +02:00

x86/entry: Fix typo in comments for syscall_enter_from_user_mode()

Just to help myself and others with finding the correct function names,
fix a typo for "usermode" vs "user_mode".

Signed-off-by: Kees Cook <keesc...@chromium.org>
Signed-off-by: Borislav Petkov <b...@suse.de>
Link: https://lkml.kernel.org/r/20200919080936.259819-1-keesc...@chromium.org
---
 include/linux/entry-common.h | 2 +-
 kernel/entry/common.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h
index efebbff..3b6754d 100644
--- a/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@ -38,7 +38,7 @@
 #endif
 
 /*
- * TIF flags handled in syscall_enter_from_usermode()
+ * TIF flags handled in syscall_enter_from_user_mode()
  */
 #ifndef ARCH_SYSCALL_ENTER_WORK
 # define ARCH_SYSCALL_ENTER_WORK       (0)
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index fcae019..7c7b9d0 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -183,7 +183,7 @@ static inline bool report_single_step(unsigned long ti_work)
 /*
  * If TIF_SYSCALL_EMU is set, then the only reason to report is when
  * TIF_SINGLESTEP is set (i.e. PTRACE_SYSEMU_SINGLESTEP).  This syscall
- * instruction has been already reported in syscall_enter_from_usermode().
+ * instruction has been already reported in syscall_enter_from_user_mode().
  */
 #define SYSEMU_STEP    (_TIF_SINGLESTEP | _TIF_SYSCALL_EMU)
 

Reply via email to