diff options
| author | Dave Watson <davejwatson@fb.com> | 2018-01-19 21:30:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-22 22:25:21 +0100 |
| commit | 7a8c4dd9be91a7e8f8f0e0419a560663adc694a3 (patch) | |
| tree | 99ba58543d67842199c468baff1cac8d272e0c14 /net | |
| parent | be2net: restore properly promisc mode after queues reconfiguration (diff) | |
| download | linux-7a8c4dd9be91a7e8f8f0e0419a560663adc694a3.tar.xz linux-7a8c4dd9be91a7e8f8f0e0419a560663adc694a3.zip | |
tls: Correct length of scatterlist in tls_sw_sendpage
The scatterlist is reused by both sendmsg and sendfile.
If a sendmsg of smaller number of pages is followed by a sendfile
of larger number of pages, the scatterlist may be too short, resulting
in a crash in gcm_encrypt.
Add sg_unmark_end to make the list the correct length.
tls_sw_sendmsg already calls sg_unmark_end correctly when it allocates
memory in alloc_sg, or in zerocopy_from_iter.
Signed-off-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tls/tls_sw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 61f394d369bf..0a9b72fbd761 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -577,6 +577,8 @@ alloc_payload: get_page(page); sg = ctx->sg_plaintext_data + ctx->sg_plaintext_num_elem; sg_set_page(sg, page, copy, offset); + sg_unmark_end(sg); + ctx->sg_plaintext_num_elem++; sk_mem_charge(sk, copy); |