From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 219EBC4360F for ; Tue, 26 Feb 2019 12:13:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E76B921855 for ; Tue, 26 Feb 2019 12:13:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726760AbfBZMNA (ORCPT ); Tue, 26 Feb 2019 07:13:00 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:58890 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726618AbfBZMM7 (ORCPT ); Tue, 26 Feb 2019 07:12:59 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from borisp@mellanox.com) with ESMTPS (AES256-SHA encrypted); 26 Feb 2019 14:12:54 +0200 Received: from gen-l-vrt-098.mtl.labs.mlnx (gen-l-vrt-098.mtl.labs.mlnx [10.137.170.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x1QCCrKR030499; Tue, 26 Feb 2019 14:12:53 +0200 From: Boris Pismenny To: aviadye@mellanox.com, davejwatson@fb.com, john.fastabend@gmail.com, daniel@iogearbox.net, vakul.garg@nxp.com, netdev@vger.kernel.org Cc: eranbe@mellanox.com, borisp@mellanox.com Subject: [PATCH net 4/4] tls: Fix tls_device receive Date: Tue, 26 Feb 2019 14:12:35 +0200 Message-Id: <20190226121235.20784-5-borisp@mellanox.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20190226121235.20784-1-borisp@mellanox.com> References: <20190226121235.20784-1-borisp@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, the receive function fails to handle records already decrypted by the device due to the commit mentioned below. This commit advances the TLS record sequence number and prepares the context to handle the next record. Fixes: fedf201e1296 ("net: tls: Refactor control message handling on recv") Signed-off-by: Boris Pismenny Reviewed-by: Eran Ben Elisha --- net/tls/tls_sw.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index f515cd7e984e..85da10182d8d 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1481,18 +1481,17 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb, return err; } - - rxm->full_len -= padding_length(ctx, tls_ctx, skb); - - rxm->offset += prot->prepend_size; - rxm->full_len -= prot->overhead_size; - tls_advance_record_sn(sk, &tls_ctx->rx, version); - ctx->decrypted = true; - ctx->saved_data_ready(sk); } else { *zc = false; } + rxm->full_len -= padding_length(ctx, tls_ctx, skb); + rxm->offset += prot->prepend_size; + rxm->full_len -= prot->overhead_size; + tls_advance_record_sn(sk, &tls_ctx->rx, version); + ctx->decrypted = true; + ctx->saved_data_ready(sk); + return err; } -- 2.12.2