diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-04-07 20:38:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-08 11:49:07 +0100 |
| commit | bfc06e1aaa130b86a81ce3c41ec71a2f5e191690 (patch) | |
| tree | 1a7011e019fb8efc32c41d7d01f73ab78c19f845 | |
| parent | dc2e0617f1fd0c5a6f601502b4379113a84ffecf (diff) | |
| download | linux-bfc06e1aaa130b86a81ce3c41ec71a2f5e191690.tar.bz2 | |
tls: rx: jump to a more appropriate label
'recv_end:' checks num_async and decrypted, and is then followed
by the 'end' label. Since we know that decrypted and num_async
are 0 at the start we can jump to 'end'.
Move the init of decrypted and num_async to let the compiler
catch if I'm wrong.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tls/tls_sw.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index a8976ef95528..6f943f0cba8a 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1760,6 +1760,7 @@ int tls_sw_recvmsg(struct sock *sk, struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx); struct tls_prot_info *prot = &tls_ctx->prot_info; struct sk_psock *psock; + int num_async, pending; unsigned char control = 0; ssize_t decrypted = 0; struct strp_msg *rxm; @@ -1772,8 +1773,6 @@ int tls_sw_recvmsg(struct sock *sk, bool is_kvec = iov_iter_is_kvec(&msg->msg_iter); bool is_peek = flags & MSG_PEEK; bool bpf_strp_enabled; - int num_async = 0; - int pending; flags |= nonblock; @@ -1795,12 +1794,14 @@ int tls_sw_recvmsg(struct sock *sk, } if (len <= copied) - goto recv_end; + goto end; target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); len = len - copied; timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); + decrypted = 0; + num_async = 0; while (len && (decrypted + copied < target || ctx->recv_pkt)) { bool retain_skb = false; bool zc = false; |