diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:21:04 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:21:04 -0500 |
| commit | 96e80af2abe243828fcc2c838af753cc5e819169 (patch) | |
| tree | a60c36939be889cb280a8ef27555b13d81066a61 /crypto | |
| parent | 864944c679274c16ff01fb9beadf35d6bf52e7a9 (diff) | |
| parent | d59dabdc4cb380b79c965af28cd4ba001f04834b (diff) | |
Merge tag 'v4.9.52' into v4.9-rt
This is the 4.9.52 stable release
Conflicts:
block/blk-core.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_skcipher.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 45af0fe00f33..aaf2f810d170 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -143,8 +143,10 @@ static int skcipher_alloc_sgl(struct sock *sk) sg_init_table(sgl->sg, MAX_SGL_ENTS + 1); sgl->cur = 0; - if (sg) + if (sg) { sg_chain(sg, MAX_SGL_ENTS + 1, sgl->sg); + sg_unmark_end(sg + (MAX_SGL_ENTS - 1)); + } list_add_tail(&sgl->list, &ctx->tsgl); } |