summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRohit Maheshwari <rohitm@chelsio.com>2020-11-09 16:21:35 +0530
committerJakub Kicinski <kuba@kernel.org>2020-11-11 16:30:37 -0800
commitc68a28a9e2798a4602dde1c77046a3b577eb31f4 (patch)
treefdacf211cada0d4e874f91d8b91ad5e23e9f9889 /drivers
parent687823d2d104df8226eacba74fda9f4ba3aecd6c (diff)
downloadlinux-c68a28a9e2798a4602dde1c77046a3b577eb31f4.tar.bz2
ch_ktls: Correction in trimmed_len calculation
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: dc05f3df8fac ("chcr: Handle first or middle part of record") Signed-off-by: Rohit Maheshwari <rohitm@chelsio.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c11
1 files changed, 7 insertions, 4 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 950841988ffe..4286decce095 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
@@ -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);