Commit 47187998 authored by Boris Pismenny's avatar Boris Pismenny Committed by David S. Miller

tls: Fix zerocopy_from_iter iov handling

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: 3c4d7559 ("tls: kernel TLS support")
Signed-off-by: default avatarBoris Pismenny <borisp@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4799ac81
...@@ -263,7 +263,7 @@ static int zerocopy_from_iter(struct sock *sk, struct iov_iter *from, ...@@ -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, ...@@ -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 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) ...@@ -415,7 +417,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
&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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment