]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ch_ktls: Correction in trimmed_len calculation
authorRohit Maheshwari <rohitm@chelsio.com>
Mon, 9 Nov 2020 10:51:35 +0000 (16:21 +0530)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 Nov 2020 00:30:37 +0000 (16:30 -0800)
trimmed length calculation goes wrong if skb has only tag part
to send. It should be zero if there is no data bytes apart from
TAG.

Fixes: ff3cf11c6c8f ("chcr: Handle first or middle part of record")
Signed-off-by: Rohit Maheshwari <rohitm@chelsio.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c

index 950841988ffeafc25f81d19a7e9337d75cc7aaab..4286decce0957e4ff744ed0991005c6d1c3217dd 100644 (file)
@@ -1729,10 +1729,13 @@ static int chcr_short_record_handler(struct chcr_ktls_info *tx_info,
 
        if (remaining_record > 0 &&
            remaining_record < TLS_CIPHER_AES_GCM_128_TAG_SIZE) {
-               int trimmed_len = data_len -
-                       (TLS_CIPHER_AES_GCM_128_TAG_SIZE - remaining_record);
-               /* don't process the pkt if it is only a partial tag */
-               if (data_len < TLS_CIPHER_AES_GCM_128_TAG_SIZE)
+               int trimmed_len = 0;
+
+               if (tls_end_offset > TLS_CIPHER_AES_GCM_128_TAG_SIZE)
+                       trimmed_len = data_len -
+                                     (TLS_CIPHER_AES_GCM_128_TAG_SIZE -
+                                      remaining_record);
+               if (!trimmed_len)
                        goto out;
 
                WARN_ON(trimmed_len > data_len);