diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-19 21:23:57 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-03 16:23:21 -0500 |
| commit | a9c56fd066f9b5d222e0813b732908dabd721867 (patch) | |
| tree | 06fe8c91bd2f3642ae354f55165880f579426f1f /crypto | |
| parent | 5446a444ae9e1976a77cb8faeab8198e44168daa (diff) | |
crypto: algif_skcipher - sendmsg SG marking is off by one
[ Upstream commit 202736d99b7f29279db9da61587f11a08a04a9c6 ]
We mark the end of the SG list in sendmsg and sendpage and unmark
it on the next send call. Unfortunately the unmarking in sendmsg
is off-by-one, leading to an SG list that is too short.
Fixes: 0f477b655a52 ("crypto: algif - Mark sgl end at the end of data")
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_skcipher.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 945075292bc9..5bc42f9b23f0 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -387,7 +387,8 @@ static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg, sgl = list_entry(ctx->tsgl.prev, struct skcipher_sg_list, list); sg = sgl->sg; - sg_unmark_end(sg + sgl->cur); + if (sgl->cur) + sg_unmark_end(sg + sgl->cur - 1); do { i = sgl->cur; plen = min_t(int, len, PAGE_SIZE); |