diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-06 18:02:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-06 18:02:37 -0700 |
| commit | d94467aed34e5ac9cf26d6178a324eed7367e98c (patch) | |
| tree | 847cb5c371ff8e857e7b7f177e09c48700ad7c73 /arch | |
| parent | Merge tag 'tomoyo-pr-20250606' of git://git.code.sf.net/p/tomoyo/tomoyo (diff) | |
| parent | s390/mm: Fix in_atomic() handling in do_secure_storage_access() (diff) | |
| download | linux-rng-d94467aed34e5ac9cf26d6178a324eed7367e98c.tar.xz linux-rng-d94467aed34e5ac9cf26d6178a324eed7367e98c.zip | |
Merge tag 's390-6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Heiko Carstens:
- Add missing select CRYPTO_ENGINE to CRYPTO_PAES_S390
- Fix secure storage access exception handling when fault handling is
disabled
* tag 's390-6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: Fix in_atomic() handling in do_secure_storage_access()
s390/crypto: Select crypto engine in Kconfig when PAES is chosen
Diffstat (limited to 'arch')
| -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 3829521450dd..e1ad05bfd28a 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -441,6 +441,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); |