summaryrefslogtreecommitdiffstats
path: root/net/tls
diff options
context:
space:
mode:
authorDoron Roberts-Kedes2018-07-26 16:59:35 +0200
committerDavid S. Miller2018-07-29 07:53:31 +0200
commit5a3611efe5b3095f348c892d040202b2ae969f4e (patch)
treeaea29e46fc5a62806b4571de523c6fb19d730f9c /net/tls
parentMerge branch 'mvneta-next' (diff)
downloadkernel-qcow2-linux-5a3611efe5b3095f348c892d040202b2ae969f4e.tar.gz
kernel-qcow2-linux-5a3611efe5b3095f348c892d040202b2ae969f4e.tar.xz
kernel-qcow2-linux-5a3611efe5b3095f348c892d040202b2ae969f4e.zip
tls: Remove dead code in tls_sw_sendmsg
tls_push_record either returns 0 on success or a negative value on failure. This patch removes code that would only be executed if tls_push_record were to return a positive value. Signed-off-by: Doron Roberts-Kedes <doronrk@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
-rw-r--r--net/tls/tls_sw.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index f9971717f7e0..e80d70a1e138 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -423,12 +423,10 @@ alloc_encrypted:
copied += try_to_copy;
ret = tls_push_record(sk, msg->msg_flags, record_type);
- if (!ret)
- continue;
- if (ret < 0)
+ if (ret)
goto send_end;
+ continue;
- copied -= try_to_copy;
fallback_to_reg_send:
iov_iter_revert(&msg->msg_iter,
ctx->sg_plaintext_size - orig_size);