niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

tls: Fix zerocopy_from_iter iov handling

Browse source 
zerocopy_from_iter iterates over the message, but it doesn't revert the
updates made by the iov iteration. This patch fixes it. Now, the iov can
be used after calling zerocopy_from_iter.

Fixes: 3c4d75591 ("tls: kernel TLS support")
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Boris Pismenny 2018-07-13 14:33:44 +03:00 • committed by David S. Miller
parent 4799ac81e5
commit 4718799817
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/tls/tls_sw.c
View file

@ -263,7 +263,7 @@ static int zerocopy_from_iter(struct sock *sk, struct iov_iter *from,
int length, int *pages_used, int length, int *pages_used,
unsigned int *size_used, unsigned int *size_used,
struct scatterlist *to, int to_max_pages, struct scatterlist *to, int to_max_pages,
bool charge) bool charge, bool revert)
{ {
struct page *pages[MAX_SKB_FRAGS]; struct page *pages[MAX_SKB_FRAGS];
@ -314,6 +314,8 @@ static int zerocopy_from_iter(struct sock *sk, struct iov_iter *from,
out: out:
*size_used = size; *size_used = size;
*pages_used = num_elem; *pages_used = num_elem;
if (revert)
iov_iter_revert(from, size);
return rc; return rc;
} }
@ -415,7 +417,7 @@ alloc_encrypted:
&ctx->sg_plaintext_size, &ctx->sg_plaintext_size,
ctx->sg_plaintext_data, ctx->sg_plaintext_data,
ARRAY_SIZE(ctx->sg_plaintext_data), ARRAY_SIZE(ctx->sg_plaintext_data),
true); true, false);
if (ret) if (ret)
goto fallback_to_reg_send; goto fallback_to_reg_send;
@ -825,7 +827,7 @@ int tls_sw_recvmsg(struct sock *sk,
err = zerocopy_from_iter(sk, &msg->msg_iter, err = zerocopy_from_iter(sk, &msg->msg_iter,
to_copy, &pages, to_copy, &pages,
&chunk, &sgin[1], &chunk, &sgin[1],
MAX_SKB_FRAGS, false); MAX_SKB_FRAGS, false, true);
if (err < 0) if (err < 0)
goto fallback_to_reg_recv; goto fallback_to_reg_recv;