Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1287c1d authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: fdfbaec5923d ("tls: stop recv() if initial process_rx_list gave us non-DATA")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 06de2302

net/tls/tls_sw.c

+4 −3
Original line number Diff line number Diff line
@@ -1748,6 +1748,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;
@@ -1760,8 +1761,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;
@@ -1783,12 +1782,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;