Patch "crypto: testmgr - Use kmalloc memory for RSA input" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
crypto: testmgr - Use kmalloc memory for RSA input
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
crypto-testmgr-use-kmalloc-memory-for-rsa-input.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
df27b26f04ed388ff4cc2b5d8cfdb5d97678816fMon Sep 17 00:00:00 2001
From: Herbert Xu <[email protected]>
Date: Thu, 5 May 2016 16:42:49 +0800
Subject: crypto: testmgr - Use kmalloc memory for RSA input
From: Herbert Xu <[email protected]>
commit df27b26f04ed388ff4cc2b5d8cfdb5d97678816f upstream.
As akcipher uses an SG interface, you must not use vmalloc memory as input for it. This patch fixes testmgr to copy the vmalloc test vectors to kmalloc memory before running the test.
This patch also removes a superfluous sg_virt call in do_test_rsa.
--- crypto/testmgr.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
crypto/testmgr.c +22 -5
@@ -1849,6 +1849,7 @@ static int alg_test_drbg(const struct alstatic int do_test_rsa (struct crypto_akcipher *tfm,struct akcipher_testvec *vecs) { +char *xbuf[XBUFSIZE ];struct akcipher_request *req;void *outbuf_enc =NULL ;void *outbuf_dec =NULL ;
@@ -1857,9 +1858,12 @@ static int do_test_rsa(struct crypto_akcint err = -ENOMEM ;struct scatterlist src, dst, src_tab[2 ]; +if (testmgr_alloc_buf (xbuf)) +return err; + req =akcipher_request_alloc (tfm,GFP_KERNEL );if (!req) -return err; + goto free_xbuf;init_completion (&result.completion);
@@ -1877,9 +1881,14 @@ static int do_test_rsa(struct crypto_akcif (!outbuf_enc) goto free_req; +if (WARN_ON (vecs->m_size >PAGE_SIZE )) + goto free_all; + +memcpy (xbuf[0 ], vecs->m, vecs->m_size); +sg_init_table (src_tab,2 ); -sg_set_buf (&src_tab[0 ], vecs->m,8 ); -sg_set_buf (&src_tab[1 ], vecs->m +8 , vecs->m_size -8 ); +sg_set_buf (&src_tab[0 ], xbuf[0 ],8 ); +sg_set_buf (&src_tab[1 ], xbuf[0 ] +8 , vecs->m_size -8 );sg_init_one (&dst, outbuf_enc, out_len_max);akcipher_request_set_crypt (req, src_tab, &dst, vecs->m_size, out_len_max);
@@ -1898,7 +1907,7 @@ static int do_test_rsa(struct crypto_akc goto free_all; }/* verify that encrypted message is equal to expected */ -if (memcmp (vecs->c,sg_virt (req->dst), vecs->c_size)) { +if (memcmp (vecs->c, outbuf_enc, vecs->c_size)) {pr_err ("alg: rsa: encrypt test failed. Invalid output\n" ); err = -EINVAL ; goto free_all;
@@ -1913,7 +1922,13 @@ static int do_test_rsa(struct crypto_akc err = -ENOMEM ; goto free_all; } -sg_init_one (&src, vecs->c, vecs->c_size); + +if (WARN_ON (vecs->c_size >PAGE_SIZE )) + goto free_all; + +memcpy (xbuf[0 ], vecs->c, vecs->c_size); + +sg_init_one (&src, xbuf[0 ], vecs->c_size);sg_init_one (&dst, outbuf_dec, out_len_max);init_completion (&result.completion);akcipher_request_set_crypt (req, &src, &dst, vecs->c_size, out_len_max);
@@ -1940,6 +1955,8 @@ free_all:kfree (outbuf_enc); free_req:akcipher_request_free (req); +free_xbuf: +testmgr_free_buf (xbuf);return err; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/crypto-testmgr-use-kmalloc-memory-for-rsa-input.patch queue-4.4/crypto-qat-fix-invalid-pf2vf_resp_wq-logic.patch queue-4.4/crypto-hash-fix-page-length-clamping-in-hash-walk.patch