diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-18 12:18:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-18 12:18:55 -0800 |
| commit | 2324de6fab2223287da7628ba92dc6cfed4f46ca (patch) | |
| tree | 3f9641a9b574ed50303535df51fb26bc052176df /drivers/s390/crypto/zcrypt_ccamisc.c | |
| parent | 8965de70cbafec673417eed423bd5e0e9c244079 (diff) | |
| parent | 40260b01d029ba374637838213af500e03305326 (diff) | |
| download | linux-2324de6fab2223287da7628ba92dc6cfed4f46ca.tar.bz2 | |
Merge tag 's390-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Fix printing misleading Secure-IPL enabled message when it is not.
- Fix a race condition between host ap bus and guest ap bus doing
device reset in crypto code.
- Fix sanity check in CCA cipher key function (CCA AES cipher key
support), which fails otherwise.
* tag 's390-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/setup: Fix secure ipl message
s390/zcrypt: move ap device reset from bus to driver code
s390/zcrypt: Fix CCA cipher key gen with clear key value function
Diffstat (limited to 'drivers/s390/crypto/zcrypt_ccamisc.c')
| -rw-r--r-- | drivers/s390/crypto/zcrypt_ccamisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/crypto/zcrypt_ccamisc.c b/drivers/s390/crypto/zcrypt_ccamisc.c index c1db64a2db21..110fe9d0cb91 100644 --- a/drivers/s390/crypto/zcrypt_ccamisc.c +++ b/drivers/s390/crypto/zcrypt_ccamisc.c @@ -1037,8 +1037,8 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, prepparm = (struct iprepparm *) prepcblk->rpl_parmb; /* do some plausibility checks on the key block */ - if (prepparm->kb.len < 120 + 5 * sizeof(uint16_t) || - prepparm->kb.len > 136 + 5 * sizeof(uint16_t)) { + if (prepparm->kb.len < 120 + 3 * sizeof(uint16_t) || + prepparm->kb.len > 136 + 3 * sizeof(uint16_t)) { DEBUG_ERR("%s reply with invalid or unknown key block\n", __func__); rc = -EIO; |