AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tls: Do not call sk_memcopy_from_iter with zero length

Browse Source 
In some conditions e.g. when tls_clone_plaintext_msg() returns -ENOSPC,
the number of bytes to be copied using subsequent function
sk_msg_memcopy_from_iter() becomes zero. This causes function
sk_msg_memcopy_from_iter() to fail which in turn causes tls_sw_sendmsg()
to return failure. To prevent it, do not call sk_msg_memcopy_from_iter()
when number of bytes to copy (indicated by 'try_to_copy') is zero.

Fixes: d829e9c411 ("tls: convert to generic sk_msg interface")
Signed-off-by: Vakul Garg <vakul.garg@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vakul Garg 2018-12-21 15:16:52 +00:00 committed by David S. Miller
parent cbb49697d5
commit 65a10e28ae
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/tls/tls_sw.c
View File

@ -935,10 +935,12 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
tls_ctx->tx.overhead_size); tls_ctx->tx.overhead_size);
} }
ret = sk_msg_memcopy_from_iter(sk, &msg->msg_iter, msg_pl, if (try_to_copy) {
try_to_copy); ret = sk_msg_memcopy_from_iter(sk, &msg->msg_iter,
msg_pl, try_to_copy);
if (ret < 0) if (ret < 0)
goto trim_sgl; goto trim_sgl;
}
/* Open records defined only if successfully copied, otherwise /* Open records defined only if successfully copied, otherwise
* we would trim the sg but not reset the open record frags. * we would trim the sg but not reset the open record frags.