tls: rx: jump to a more appropriate label

[ Upstream commit bfc06e1aaa130b86a81ce3c41ec71a2f5e191690 ]

'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>
Stable-dep-of: fdfbaec5923d ("tls: stop recv() if initial process_rx_list gave us non-DATA")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 9ff3e4df2d6c5178644e30cef0f68cdba6cc9d3e..c8285c596b5f4fd22d593a12cf34e9d30c58319a 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1755,6 +1755,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;
@@ -1767,8 +1768,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;
 
@@ -1790,12 +1789,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;