summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-08-29 00:04:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-08-29 00:04:55 +0300
commit6bfce7759c46132154301a742b54a64ff97b498c (patch)
tree68f37a08f962397a540070c5d972cb391df2da0e /kernel
parentb98af53cb07a69a08ffd8cca29a449f1e7de4837 (diff)
parent1dfe3a5a7cefbe2162cecb759f3933baea22c393 (diff)
downloadlinux-6bfce7759c46132154301a742b54a64ff97b498c.tar.xz
Merge tag 'core-entry-2023-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core entry code update from Thomas Gleixner: "A single update to the core entry code, which removes the empty user address limit check which is a leftover of the removed TIF_FSCHECK" * tag 'core-entry-2023-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: entry: Remove empty addr_limit_user_check()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/entry/common.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index be61332c66b5..d7ee4bc3f2ba 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -205,8 +205,7 @@ static void exit_to_user_mode_prepare(struct pt_regs *regs)
arch_exit_to_user_mode_prepare(regs, ti_work);
- /* Ensure that the address limit is intact and no locks are held */
- addr_limit_user_check();
+ /* Ensure that kernel state is sane for a return to userspace */
kmap_assert_nomap();
lockdep_assert_irqs_disabled();
lockdep_sys_exit();