| Message ID | 20210813075508.98854-2-tianjia.zhang@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | support test GCM/CCM mode for SM4 | expand |
On Fri, Aug 13, 2021 at 03:55:06PM +0800, Tianjia Zhang wrote: > There are several places where the return value check of crypto_aead_setkey > and crypto_aead_setauthsize were lost. It is necessary to add these checks. > > At the same time, move the crypto_aead_setauthsize() call out of the loop, > and only need to call it once after load transform. > > Fixee: 53f52d7aecb4 ("crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite") > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Reviewed-by: Vitaly Chikunov <vt@altlinux.org> Thanks, > --- > crypto/tcrypt.c | 29 +++++++++++++++++++---------- > 1 file changed, 19 insertions(+), 10 deletions(-) > > diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c > index d73a42fdaa9b..170102e92f7d 100644 > --- a/crypto/tcrypt.c > +++ b/crypto/tcrypt.c > @@ -290,6 +290,11 @@ static void test_mb_aead_speed(const char *algo, int enc, int secs, > } > > ret = crypto_aead_setauthsize(tfm, authsize); > + if (ret) { > + pr_err("alg: aead: Failed to setauthsize for %s: %d\n", algo, > + ret); > + goto out_free_tfm; > + } > > for (i = 0; i < num_mb; ++i) > if (testmgr_alloc_buf(data[i].xbuf)) { > @@ -315,7 +320,7 @@ static void test_mb_aead_speed(const char *algo, int enc, int secs, > for (i = 0; i < num_mb; ++i) { > data[i].req = aead_request_alloc(tfm, GFP_KERNEL); > if (!data[i].req) { > - pr_err("alg: skcipher: Failed to allocate request for %s\n", > + pr_err("alg: aead: Failed to allocate request for %s\n", > algo); > while (i--) > aead_request_free(data[i].req); > @@ -567,13 +572,19 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, > sgout = &sg[9]; > > tfm = crypto_alloc_aead(algo, 0, 0); > - > if (IS_ERR(tfm)) { > pr_err("alg: aead: Failed to load transform for %s: %ld\n", algo, > PTR_ERR(tfm)); > goto out_notfm; > } > > + ret = crypto_aead_setauthsize(tfm, authsize); > + if (ret) { > + pr_err("alg: aead: Failed to setauthsize for %s: %d\n", algo, > + ret); > + goto out_noreq; > + } > + > crypto_init_wait(&wait); > printk(KERN_INFO "\ntesting speed of %s (%s) %s\n", algo, > get_driver_name(crypto_aead, tfm), e); > @@ -611,8 +622,13 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, > break; > } > } > + > ret = crypto_aead_setkey(tfm, key, *keysize); > - ret = crypto_aead_setauthsize(tfm, authsize); > + if (ret) { > + pr_err("setkey() failed flags=%x: %d\n", > + crypto_aead_get_flags(tfm), ret); > + goto out; > + } > > iv_len = crypto_aead_ivsize(tfm); > if (iv_len) > @@ -622,15 +638,8 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, > printk(KERN_INFO "test %u (%d bit key, %d byte blocks): ", > i, *keysize * 8, bs); > > - > memset(tvmem[0], 0xff, PAGE_SIZE); > > - if (ret) { > - pr_err("setkey() failed flags=%x\n", > - crypto_aead_get_flags(tfm)); > - goto out; > - } > - > sg_init_aead(sg, xbuf, bs + (enc ? 0 : authsize), > assoc, aad_size); > > -- > 2.19.1.3.ge56e4f7
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index d73a42fdaa9b..170102e92f7d 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -290,6 +290,11 @@ static void test_mb_aead_speed(const char *algo, int enc, int secs, } ret = crypto_aead_setauthsize(tfm, authsize); + if (ret) { + pr_err("alg: aead: Failed to setauthsize for %s: %d\n", algo, + ret); + goto out_free_tfm; + } for (i = 0; i < num_mb; ++i) if (testmgr_alloc_buf(data[i].xbuf)) { @@ -315,7 +320,7 @@ static void test_mb_aead_speed(const char *algo, int enc, int secs, for (i = 0; i < num_mb; ++i) { data[i].req = aead_request_alloc(tfm, GFP_KERNEL); if (!data[i].req) { - pr_err("alg: skcipher: Failed to allocate request for %s\n", + pr_err("alg: aead: Failed to allocate request for %s\n", algo); while (i--) aead_request_free(data[i].req); @@ -567,13 +572,19 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, sgout = &sg[9]; tfm = crypto_alloc_aead(algo, 0, 0); - if (IS_ERR(tfm)) { pr_err("alg: aead: Failed to load transform for %s: %ld\n", algo, PTR_ERR(tfm)); goto out_notfm; } + ret = crypto_aead_setauthsize(tfm, authsize); + if (ret) { + pr_err("alg: aead: Failed to setauthsize for %s: %d\n", algo, + ret); + goto out_noreq; + } + crypto_init_wait(&wait); printk(KERN_INFO "\ntesting speed of %s (%s) %s\n", algo, get_driver_name(crypto_aead, tfm), e); @@ -611,8 +622,13 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, break; } } + ret = crypto_aead_setkey(tfm, key, *keysize); - ret = crypto_aead_setauthsize(tfm, authsize); + if (ret) { + pr_err("setkey() failed flags=%x: %d\n", + crypto_aead_get_flags(tfm), ret); + goto out; + } iv_len = crypto_aead_ivsize(tfm); if (iv_len) @@ -622,15 +638,8 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, printk(KERN_INFO "test %u (%d bit key, %d byte blocks): ", i, *keysize * 8, bs); - memset(tvmem[0], 0xff, PAGE_SIZE); - if (ret) { - pr_err("setkey() failed flags=%x\n", - crypto_aead_get_flags(tfm)); - goto out; - } - sg_init_aead(sg, xbuf, bs + (enc ? 0 : authsize), assoc, aad_size);
There are several places where the return value check of crypto_aead_setkey and crypto_aead_setauthsize were lost. It is necessary to add these checks. At the same time, move the crypto_aead_setauthsize() call out of the loop, and only need to call it once after load transform. Fixee: 53f52d7aecb4 ("crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite") Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> --- crypto/tcrypt.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)