From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vakul Garg Subject: [net-next v3 5/5] net/tls: Rework error checking after decrypt_skb_update() Date: Thu, 19 Jul 2018 16:46:43 +0530 Message-ID: <20180719111643.12787-6-vakul.garg@nxp.com> References: <20180719111643.12787-1-vakul.garg@nxp.com> Mime-Version: 1.0 Content-Type: text/plain Cc: borisp@mellanox.com, aviadye@mellanox.com, davejwatson@fb.com, davem@davemloft.net, Vakul Garg To: netdev@vger.kernel.org Return-path: Received: from mail-eopbgr10075.outbound.protection.outlook.com ([40.107.1.75]:21590 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730316AbeGSGiz (ORCPT ); Thu, 19 Jul 2018 02:38:55 -0400 In-Reply-To: <20180719111643.12787-1-vakul.garg@nxp.com> Sender: netdev-owner@vger.kernel.org List-ID: Error checking code after invoking decrypt_skb_update() for zero-copy and non-zero-copy cases in tls_sw_recvmsg has been made common. Signed-off-by: Vakul Garg --- net/tls/tls_sw.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index ae0b40d6671b..da3b884bea93 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -824,18 +824,16 @@ int tls_sw_recvmsg(struct sock *sk, err = decrypt_skb_update(sk, skb, sgin); for (; pages > 0; pages--) put_page(sg_page(&sgin[pages])); - if (err < 0) { - tls_err_abort(sk, EBADMSG); - goto recv_end; - } } else { fallback_to_reg_recv: err = decrypt_skb_update(sk, skb, NULL); - if (err < 0) { - tls_err_abort(sk, EBADMSG); - goto recv_end; - } } + + if (err < 0) { + tls_err_abort(sk, EBADMSG); + goto recv_end; + } + ctx->decrypted = true; } -- 2.13.6