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 | |
| parent | 27fb892d364bd18a66b61a04b63401b18aeee253 (diff) | |
| parent | 11709abccf93b08adde95ef313c300b0d4bc28f1 (diff) | |
| download | linux-d94467aed34e5ac9cf26d6178a324eed7367e98c.tar.gz | |
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
| -rw-r--r-- | arch/s390/mm/fault.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/Kconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 3829521450ddef..e1ad05bfd28ad4 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); diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 5686369779be01..9f8a3a5bed7ec0 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -180,6 +180,7 @@ config CRYPTO_PAES_S390 depends on PKEY select CRYPTO_ALGAPI select CRYPTO_SKCIPHER + select CRYPTO_ENGINE help This is the s390 hardware accelerated implementation of the AES cipher algorithms for use with protected key. |