summaryrefslogtreecommitdiff
path: root/crypto/testmgr.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-08-20 18:05:17 +0200
committerJiri Kosina <jkosina@suse.cz>2018-08-20 18:05:17 +0200
commit52809a360945ab1f87eea8ebed524f725be9ad88 (patch)
treefc620383397a212bc66630c86fbbd6adb2e32f40 /crypto/testmgr.c
parentd7c5fbc31d674b124b89d3ddb51892cf24ad2ad5 (diff)
parentea2d7a962774232c5ec13f85a399e7f2a7b6746e (diff)
downloadlinux-crypto-52809a360945ab1f87eea8ebed524f725be9ad88.tar.gz
linux-crypto-52809a360945ab1f87eea8ebed524f725be9ad88.zip
Merge branch 'for-4.19/cougar' into for-linus
New device support for hid-cougar
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r--crypto/testmgr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index d1d99843..11e45352 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -603,7 +603,8 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
goto out_nooutbuf;
/* avoid "the frame size is larger than 1024 bytes" compiler warning */
- sg = kmalloc(sizeof(*sg) * 8 * (diff_dst ? 4 : 2), GFP_KERNEL);
+ sg = kmalloc(array3_size(sizeof(*sg), 8, (diff_dst ? 4 : 2)),
+ GFP_KERNEL);
if (!sg)
goto out_nosg;
sgout = &sg[16];