netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net, pabeni@redhat.com
Cc: netdev@vger.kernel.org, borisp@nvidia.com,
	john.fastabend@gmail.com, daniel@iogearbox.net,
	vfedorenko@novek.ru, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 07/10] tls: rx: replace 'back' with 'offset'
Date: Thu,  7 Apr 2022 20:38:20 -0700	[thread overview]
Message-ID: <20220408033823.965896-8-kuba@kernel.org> (raw)
In-Reply-To: <20220408033823.965896-1-kuba@kernel.org>

The padding length TLS 1.3 logic is searching for content_type from
the end of text. IMHO the code is easier to parse if we calculate
offset and decrement it rather than try to maintain positive offset
from the end of the record called "back".

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 net/tls/tls_sw.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 579ccfd011a1..9729244ce3fc 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -136,22 +136,21 @@ static int padding_length(struct tls_prot_info *prot, struct sk_buff *skb)
 
 	/* Determine zero-padding length */
 	if (prot->version == TLS_1_3_VERSION) {
-		int back = TLS_TAG_SIZE + 1;
+		int offset = rxm->full_len - TLS_TAG_SIZE - 1;
 		char content_type = 0;
 		int err;
 
 		while (content_type == 0) {
-			if (back > rxm->full_len - prot->prepend_size)
+			if (offset < prot->prepend_size)
 				return -EBADMSG;
-			err = skb_copy_bits(skb,
-					    rxm->offset + rxm->full_len - back,
+			err = skb_copy_bits(skb, rxm->offset + offset,
 					    &content_type, 1);
 			if (err)
 				return err;
 			if (content_type)
 				break;
 			sub++;
-			back++;
+			offset--;
 		}
 		tlm->control = content_type;
 	}
-- 
2.34.1


  parent reply	other threads:[~2022-04-08  3:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-08  3:38 [PATCH net-next 00/10] tls: rx: random refactoring part 1 Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 01/10] tls: rx: jump to a more appropriate label Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 02/10] tls: rx: drop pointless else after goto Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 03/10] tls: rx: don't store the record type in socket context Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 04/10] tls: rx: don't store the decryption status " Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 05/10] tls: rx: init decrypted status in tls_read_size() Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 06/10] tls: rx: use a define for tag length Jakub Kicinski
2022-04-08  3:38 ` Jakub Kicinski [this message]
2022-04-08  3:38 ` [PATCH net-next 08/10] tls: rx: don't issue wake ups when data is decrypted Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 09/10] tls: rx: refactor decrypt_skb_update() Jakub Kicinski
2022-04-08  3:38 ` [PATCH net-next 10/10] tls: hw: rx: use return value of tls_device_decrypted() to carry status Jakub Kicinski
2022-04-08 11:10 ` [PATCH net-next 00/10] tls: rx: random refactoring part 1 patchwork-bot+netdevbpf

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=20220408033823.965896-8-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=borisp@nvidia.com \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=john.fastabend@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=vfedorenko@novek.ru \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).