diff options
| author | Tom Lendacky <thomas.lendacky@amd.com> | 2014-01-06 13:33:59 -0600 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-01-15 11:33:35 +0800 |
| commit | 5258de8af04af0caf129f1ce432d1817a5800887 (patch) | |
| tree | 9ab34cb02735c76c17c92193cafc53468fbd22e6 | |
| parent | d16b87003ff4e5ae5138e492113de73ff85d35f2 (diff) | |
| download | linux-5258de8af04af0caf129f1ce432d1817a5800887.tar.bz2 | |
crypto: ccp - Apply appropriate gfp_t type to memory allocations
Fix some memory allocations to use the appropriate gfp_t type based
on the CRYPTO_TFM_REQ_MAY_SLEEP flag.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 5 | ||||
| -rw-r--r-- | drivers/crypto/ccp/ccp-crypto-sha.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c index 64dd35e291b0..398832c2414a 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c +++ b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c @@ -61,6 +61,7 @@ static int ccp_do_cmac_update(struct ahash_request *req, unsigned int nbytes, unsigned int block_size = crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); unsigned int len, need_pad, sg_count; + gfp_t gfp; int ret; if (!ctx->u.aes.key_len) @@ -99,7 +100,9 @@ static int ccp_do_cmac_update(struct ahash_request *req, unsigned int nbytes, * possible data pieces (buffer, input data, padding) */ sg_count = (nbytes) ? sg_nents(req->src) + 2 : 2; - ret = sg_alloc_table(&rctx->data_sg, sg_count, GFP_KERNEL); + gfp = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? + GFP_KERNEL : GFP_ATOMIC; + ret = sg_alloc_table(&rctx->data_sg, sg_count, gfp); if (ret) return ret; diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c index b0881df67534..0571940cfdf9 100644 --- a/drivers/crypto/ccp/ccp-crypto-sha.c +++ b/drivers/crypto/ccp/ccp-crypto-sha.c @@ -128,6 +128,7 @@ static int ccp_do_sha_update(struct ahash_request *req, unsigned int nbytes, unsigned int block_size = crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); unsigned int len, sg_count; + gfp_t gfp; int ret; if (!final && ((nbytes + rctx->buf_count) <= block_size)) { @@ -156,7 +157,9 @@ static int ccp_do_sha_update(struct ahash_request *req, unsigned int nbytes, * possible data pieces (hmac ipad, buffer, input data) */ sg_count = (nbytes) ? sg_nents(req->src) + 2 : 2; - ret = sg_alloc_table(&rctx->data_sg, sg_count, GFP_KERNEL); + gfp = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? + GFP_KERNEL : GFP_ATOMIC; + ret = sg_alloc_table(&rctx->data_sg, sg_count, gfp); if (ret) return ret; |