diff options
author | 2023-05-27 08:32:07 +0100 | |
---|---|---|
committer | 2023-05-27 08:32:07 +0100 | |
commit | 0e4daea31d8312dd9f957a62717d4b5f31ef494c (patch) | |
tree | a9edacaf51413354d0df35f6faf7f002a6f34bf0 /drivers/s390/crypto/pkey_api.c | |
parent | serial: Make uart_remove_one_port() return void (diff) | |
parent | Linux 6.4-rc3 (diff) | |
download | linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.tar.gz linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.tar.bz2 linux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.zip |
Merge 6.4-rc3 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/crypto/pkey_api.c')
-rw-r--r-- | drivers/s390/crypto/pkey_api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c index 5a05d1cdfec2..a8def50c149b 100644 --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -1293,6 +1293,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, return PTR_ERR(kkey); rc = pkey_keyblob2pkey(kkey, ktp.keylen, &ktp.protkey); DEBUG_DBG("%s pkey_keyblob2pkey()=%d\n", __func__, rc); + memzero_explicit(kkey, ktp.keylen); kfree(kkey); if (rc) break; @@ -1426,6 +1427,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, kkey, ktp.keylen, &ktp.protkey); DEBUG_DBG("%s pkey_keyblob2pkey2()=%d\n", __func__, rc); kfree(apqns); + memzero_explicit(kkey, ktp.keylen); kfree(kkey); if (rc) break; @@ -1552,6 +1554,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, protkey, &protkeylen); DEBUG_DBG("%s pkey_keyblob2pkey3()=%d\n", __func__, rc); kfree(apqns); + memzero_explicit(kkey, ktp.keylen); kfree(kkey); if (rc) { kfree(protkey); |