All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rohit Maheshwari <rohitm@chelsio.com>
To: kuba@kernel.org, netdev@vger.kernel.org, davem@davemloft.net
Cc: secdev@chelsio.com, Rohit Maheshwari <rohitm@chelsio.com>
Subject: [net v6 06/12] ch_ktls: missing handling of header alone
Date: Mon,  9 Nov 2020 16:21:36 +0530	[thread overview]
Message-ID: <20201109105142.15398-7-rohitm@chelsio.com> (raw)
In-Reply-To: <20201109105142.15398-1-rohitm@chelsio.com>

If an skb has only header part which doesn't start from
beginning, is not being handled properly.

Fixes: dc05f3df8fac ("chcr: Handle first or middle part of record")
Signed-off-by: Rohit Maheshwari <rohitm@chelsio.com>
---
 .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
index 4286decce095..8a54fce9bfae 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
@@ -1744,6 +1744,17 @@ static int chcr_short_record_handler(struct chcr_ktls_info *tx_info,
 		atomic64_inc(&tx_info->adap->ch_ktls_stats.ktls_tx_trimmed_pkts);
 	}
 
+	/* check if it is only the header part. */
+	if (tls_rec_offset + data_len <= (TLS_HEADER_SIZE + tx_info->iv_size)) {
+		if (chcr_ktls_tx_plaintxt(tx_info, skb, tcp_seq, mss,
+					  tcp_push_no_fin, q,
+					  tx_info->port_id, prior_data,
+					  data_len, skb_offset, prior_data_len))
+			goto out;
+
+		return 0;
+	}
+
 	/* check if the middle record's start point is 16 byte aligned. CTR
 	 * needs 16 byte aligned start point to start encryption.
 	 */
@@ -1812,20 +1823,6 @@ static int chcr_short_record_handler(struct chcr_ktls_info *tx_info,
 			goto out;
 		atomic64_inc(&tx_info->adap->ch_ktls_stats.ktls_tx_middle_pkts);
 	} else {
-		/* Else means, its a partial first part of the record. Check if
-		 * its only the header, don't need to send for encryption then.
-		 */
-		if (data_len <= TLS_HEADER_SIZE + tx_info->iv_size) {
-			if (chcr_ktls_tx_plaintxt(tx_info, skb, tcp_seq, mss,
-						  tcp_push_no_fin, q,
-						  tx_info->port_id,
-						  prior_data,
-						  data_len, skb_offset,
-						  prior_data_len)) {
-				goto out;
-			}
-			return 0;
-		}
 		atomic64_inc(&tx_info->adap->ch_ktls_stats.ktls_tx_start_pkts);
 	}
 
-- 
2.18.1


  parent reply	other threads:[~2020-11-09 10:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-09 10:51 [net v6 00/12] cxgb4/ch_ktls: Fixes in nic tls code Rohit Maheshwari
2020-11-09 10:51 ` [net v6 01/12] cxgb4/ch_ktls: decrypted bit is not enough Rohit Maheshwari
2020-11-09 10:51 ` [net v6 02/12] ch_ktls: Correction in finding correct length Rohit Maheshwari
2020-11-09 10:51 ` [net v6 03/12] ch_ktls: Update cheksum information Rohit Maheshwari
2020-11-09 10:51 ` [net v6 04/12] cxgb4/ch_ktls: creating skbs causes panic Rohit Maheshwari
2020-11-09 10:51 ` [net v6 05/12] ch_ktls: Correction in trimmed_len calculation Rohit Maheshwari
2020-11-09 10:51 ` Rohit Maheshwari [this message]
2020-11-09 10:51 ` [net v6 07/12] ch_ktls: Correction in middle record handling Rohit Maheshwari
2020-11-09 10:51 ` [net v6 08/12] ch_ktls: packet handling prior to start marker Rohit Maheshwari
2020-11-09 10:51 ` [net v6 09/12] ch_ktls: don't free skb before sending FIN Rohit Maheshwari
2020-11-09 10:51 ` [net v6 10/12] ch_ktls/cxgb4: handle partial tag alone SKBs Rohit Maheshwari
2020-11-09 10:51 ` [net v6 11/12] ch_ktls: tcb update fails sometimes Rohit Maheshwari
2020-11-09 10:51 ` [net v6 12/12] ch_ktls: stop the txq if reaches threshold Rohit Maheshwari
2020-11-12  0:37 ` [net v6 00/12] cxgb4/ch_ktls: Fixes in nic tls code Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201109105142.15398-7-rohitm@chelsio.com \
    --to=rohitm@chelsio.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=secdev@chelsio.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.