diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
| commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 (patch) | |
| tree | c8441197c74e9df8407a00eff2433540924ca5ce /crypto | |
| parent | 796b40c6171456274b02447e1dbbea97456403fe (diff) | |
| parent | 40c98cb57cdbc377456116ad4582c89e329721b0 (diff) | |
| download | linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.gz linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.bz2 linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict between caam changes.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/lrw.c | 7 | ||||
| -rw-r--r-- | crypto/xts.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/crypto/lrw.c b/crypto/lrw.c index ecd8474018e3..3ea095adafd9 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -286,8 +286,11 @@ static int init_crypt(struct skcipher_request *req, crypto_completion_t done) subreq->cryptlen = LRW_BUFFER_SIZE; if (req->cryptlen > LRW_BUFFER_SIZE) { - subreq->cryptlen = min(req->cryptlen, (unsigned)PAGE_SIZE); - rctx->ext = kmalloc(subreq->cryptlen, gfp); + unsigned int n = min(req->cryptlen, (unsigned int)PAGE_SIZE); + + rctx->ext = kmalloc(n, gfp); + if (rctx->ext) + subreq->cryptlen = n; } rctx->src = req->src; diff --git a/crypto/xts.c b/crypto/xts.c index baeb34dd8582..c976bfac29da 100644 --- a/crypto/xts.c +++ b/crypto/xts.c @@ -230,8 +230,11 @@ static int init_crypt(struct skcipher_request *req, crypto_completion_t done) subreq->cryptlen = XTS_BUFFER_SIZE; if (req->cryptlen > XTS_BUFFER_SIZE) { - subreq->cryptlen = min(req->cryptlen, (unsigned)PAGE_SIZE); - rctx->ext = kmalloc(subreq->cryptlen, gfp); + unsigned int n = min(req->cryptlen, (unsigned int)PAGE_SIZE); + + rctx->ext = kmalloc(n, gfp); + if (rctx->ext) + subreq->cryptlen = n; } rctx->src = req->src; |