nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

more s390 updates for 6.16 merge window

Browse source 
- Add missing select CRYPTO_ENGINE to CRYPTO_PAES_S390
 
 - Fix secure storage access exception handling when fault handling is
   disabled
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEECMNfWEw3SLnmiLkZIg7DeRspbsIFAmhDA9UACgkQIg7DeRsp
 bsI5cw//cwWLR/btD2Uvdt5qIo6Z6uePdx3yiFJBMxS82WmrHugMiRwH9LAd79It
 BfYg5zbkOY1qQhoih5ynCsPIushZJp8i7V4lBvqH6OoUGTyqgrsEvQVyxF/xDvB2
 WCDxvXpvLzmpinEWQh6ilefEWf9Zd1dVb+gGvospweFSEQfX6Rl1P6i2xQYss3pz
 22kX1GfjEORDfM4NCpQ48wo16WEavhYlt+GddVhjb75DRronr7q9PDAVVs6aMOSU
 GlIukaKZVKZre5QXqfhjkpWMvtPkbzdjZ1h+QAtmTx4iwaMrLPX0Va8g/mtKyjkD
 mbyJ+Anm8FkoAArBUdSXVi9mDu2Xp+WDRMrkFRQQoqW+RXrjyobdxUriVQKLmHNo
 j/G0iQsVIv1xH8v4cuXcl2wAgAl5X6PkVWp+UYwjM9C3ZJTOxBtqYNNxSr2DURYF
 PvSe8+htDa+a8Mj15vHV3g03qaIbs8Zp4pHyzVur/nb/7NKc2U7HC7IT4T4AtdCa
 vk20OsSvHF+meZIERSMcSbjiXuQuSBwckN3Tm5DCP7Q1SeBwKlDQHmWqPTWMzzbc
 ZQdYlRU+xbY5GxQwaRB3r3TI+wo0ET5OFBR//YvehjTnVNMxY91mNGx35R1nMKHI
 cPeVXOlEV76dzY9gOfMuIh9C1DGlCr3d7+jdixL3ooFWDitbFx4=
 =HiQ0
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-06-06 18:02:37 -07:00
commit d94467aed3
2 changed files with 3 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
arch/s390/mm/fault.c
View file

@ -441,6 +441,8 @@ void do_secure_storage_access(struct pt_regs *regs)
if (rc) if (rc)
BUG(); BUG();
} else { } else {
if (faulthandler_disabled())
return handle_fault_error_nolock(regs, 0);
mm = current->mm; mm = current->mm;
mmap_read_lock(mm); mmap_read_lock(mm);
vma = find_vma(mm, addr); vma = find_vma(mm, addr);

1
drivers/crypto/Kconfig
View file

@ -180,6 +180,7 @@ config CRYPTO_PAES_S390
depends on PKEY depends on PKEY
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_SKCIPHER select CRYPTO_SKCIPHER
select CRYPTO_ENGINE
help help
This is the s390 hardware accelerated implementation of the This is the s390 hardware accelerated implementation of the
AES cipher algorithms for use with protected key. AES cipher algorithms for use with protected key.