[PATCH 1/1] crypto: Fix possible buffer overflows in pkey_protkey_aes_attr_read
From: Xiaohui Zhang
Date: Wed Dec 09 2020 - 04:25:28 EST
From: Zhang Xiaohui <ruc_zhangxiaohui@xxxxxxx>
pkey_protkey_aes_attr_read() calls memcpy() without checking the
destination size may trigger a buffer overflower.
Signed-off-by: Zhang Xiaohui <ruc_zhangxiaohui@xxxxxxx>
---
drivers/s390/crypto/pkey_api.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
index 99cb60ea6..abc237130 100644
--- a/drivers/s390/crypto/pkey_api.c
+++ b/drivers/s390/crypto/pkey_api.c
@@ -1589,6 +1589,8 @@ static ssize_t pkey_protkey_aes_attr_read(u32 keytype, bool is_xts, char *buf,
if (rc)
return rc;
+ if (protkey.len > MAXPROTKEYSIZE)
+ protkey.len = MAXPROTKEYSIZE;
protkeytoken.len = protkey.len;
memcpy(&protkeytoken.protkey, &protkey.protkey, protkey.len);
@@ -1599,6 +1601,8 @@ static ssize_t pkey_protkey_aes_attr_read(u32 keytype, bool is_xts, char *buf,
if (rc)
return rc;
+ if (protkey.len > MAXPROTKEYSIZE)
+ protkey.len = MAXPROTKEYSIZE;
protkeytoken.len = protkey.len;
memcpy(&protkeytoken.protkey, &protkey.protkey, protkey.len);
--
2.17.1