diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-17 08:42:44 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-17 08:42:44 -0500 |
| commit | e1b391fe80b911022d016774881d6b16979ac43d (patch) | |
| tree | c1a8277fae4710ec349be4bba0c21de76ca261e3 /crypto | |
| parent | 4d8d44b0779a5f9dbf51b18128674b5ecfd60d4f (diff) | |
| parent | 05bcf8f867f4af11c93395d4a6dd1dd52d8904ea (diff) | |
Merge tag 'v3.10.24' into v3.10-rt
This is the 3.10.24 stable release
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_hash.c | 3 | ||||
| -rw-r--r-- | crypto/algif_skcipher.c | 3 | ||||
| -rw-r--r-- | crypto/authenc.c | 7 | ||||
| -rw-r--r-- | crypto/ccm.c | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 850246206b12..585c3b279feb 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -117,6 +117,9 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); sg_init_table(ctx->sgl.sg, 1); sg_set_page(ctx->sgl.sg, page, size, offset); diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index a19c027b29bd..918a3b4148b8 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -381,6 +381,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); if (!ctx->more && ctx->used) goto unlock; diff --git a/crypto/authenc.c b/crypto/authenc.c index ffce19de05cf..528b00bc4769 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c @@ -368,9 +368,10 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req, if (!err) { struct crypto_aead *authenc = crypto_aead_reqtfm(areq); struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc); - struct ablkcipher_request *abreq = aead_request_ctx(areq); - u8 *iv = (u8 *)(abreq + 1) + - crypto_ablkcipher_reqsize(ctx->enc); + struct authenc_request_ctx *areq_ctx = aead_request_ctx(areq); + struct ablkcipher_request *abreq = (void *)(areq_ctx->tail + + ctx->reqoff); + u8 *iv = (u8 *)abreq - crypto_ablkcipher_ivsize(ctx->enc); err = crypto_authenc_genicv(areq, iv, 0); } diff --git a/crypto/ccm.c b/crypto/ccm.c index 499c91717d93..ed009b77e67d 100644 --- a/crypto/ccm.c +++ b/crypto/ccm.c @@ -271,7 +271,8 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain, } /* compute plaintext into mac */ - get_data_to_compute(cipher, pctx, plain, cryptlen); + if (cryptlen) + get_data_to_compute(cipher, pctx, plain, cryptlen); out: return err; |