]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tls: rx: drop pointless else after goto
authorJakub Kicinski <kuba@kernel.org>
Fri, 8 Apr 2022 03:38:15 +0000 (20:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Mar 2024 12:16:51 +0000 (13:16 +0100)
[ Upstream commit d5123edd10cf9d324fcb88e276bdc7375f3c5321 ]

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

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>
net/tls/tls_sw.c

index d11094a81ee6c17656f073f9a3c4704fe6080361..732f96b7bafc8c1b6f74dfc4e76acec0a514e1dd 100644 (file)
@@ -1783,10 +1783,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 end;