From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BE661420DA; Tue, 27 Feb 2024 14:25:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709043942; cv=none; b=bSESAd9KDIqNNodqSS+d+fXqKftT/1UAn8Jl88FcaRxXopXZVvr2Ipz5RcEus9mQBWtlD6tdbq7HUwVab+erqq7oZXE8vJ77KIdmWMfm5XN6MM5+FIFfk1WqEnhcBXTf0Gv7zW3znHjlqC27qhd8FVeppSaLbWl02ThIfQ2lV24= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709043942; c=relaxed/simple; bh=l1tt1bNB6Dm4JawhedatBCFQ24sk4hSgH1/PIDOsW+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l/pkX7H7t1tgnmv/c4nS8nRconmsMXs51/a0/W1BTQTGMKcPulhgO7RsaCOodWvtJaQoEJd4c+IJUeOGIo7q9jSm8DZc0Yguy66TTPbXteL/g34g5eYWKhHs5VsShQvIL36gLod9ZdNsaWtx7Wc3EzHYGgqMnfA+6YFaQc6RXIk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=huP+wPYd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="huP+wPYd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1897FC433C7; Tue, 27 Feb 2024 14:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709043942; bh=l1tt1bNB6Dm4JawhedatBCFQ24sk4hSgH1/PIDOsW+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=huP+wPYdNXzx0dGNixUOlnARv2XZ5moKykVGIIlICcSlEnKexWfYI7+aLcRCoyyCE 7LOfaTNaqBR9xebTAn2xjknnsXGeoinivu7H+2NznafDJEXTwVTaannI89iBxDVokH jDekYmKa7BNXmMqkB96g3nW7gWMeGSo+sbQdDaO0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jakub Kicinski , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 78/84] tls: rx: drop pointless else after goto Date: Tue, 27 Feb 2024 14:27:45 +0100 Message-ID: <20240227131555.409714424@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131552.864701583@linuxfoundation.org> References: <20240227131552.864701583@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit d5123edd10cf9d324fcb88e276bdc7375f3c5321 ] Pointless else branch after goto makes the code harder to refactor down the line. Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Stable-dep-of: fdfbaec5923d ("tls: stop recv() if initial process_rx_list gave us non-DATA") Signed-off-by: Sasha Levin --- net/tls/tls_sw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 606a51237c50f..fb7428f222a8f 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1777,10 +1777,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; -- 2.43.0