Commit 3c0d556d authored by Jakub Kicinski's avatar Jakub Kicinski Committed by sanglipeng1
Browse files

tls: rx: drop pointless else after goto 

stable inclusion
from stable-v5.10.211
commit 7c54eaa3b078576024fef97fde3d2dabf13efa97
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF2J4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7c54eaa3b078576024fef97fde3d2dabf13efa97



--------------------------------

[ Upstream commit d5123edd ]

Pointless else branch after goto makes the code harder to refactor
down the line.

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>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent c5f564ec

net/tls/tls_sw.c

+1 −2
Original line number Diff line number Diff line
@@ -1786,10 +1786,9 @@ int tls_sw_recvmsg(struct sock *sk, 
	if (err < 0) {

		tls_err_abort(sk, err);

		goto end;

	} else {

		copied = err;

	}



	copied = err;

	if (len <= copied)

		goto recv_end;