diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-06 12:04:26 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-06 12:04:26 +0300 |
commit | a681e6559ce6fe8ca56333f7041d0a0d38aaee94 (patch) | |
tree | 8f369aaa68139cf75a444ac404bae12e52c4ea80 /arch/s390/mm/fault.c | |
parent | 53c2f13c1ee59c8889bf23ef58653677e3ec1644 (diff) | |
parent | 7b59ab988c01c190f1b528cf750d6f33b738d1e2 (diff) | |
download | linux-rolling-stable.tar.xz |
Merge v6.15.5linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/mm/fault.c')
-rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index da84ff6770de..8b3f6dd00eab 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -442,6 +442,8 @@ void do_secure_storage_access(struct pt_regs *regs) if (rc) BUG(); } else { + if (faulthandler_disabled()) + return handle_fault_error_nolock(regs, 0); mm = current->mm; mmap_read_lock(mm); vma = find_vma(mm, addr); |