netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
	borisp@nvidia.com, john.fastabend@gmail.com, tariqt@nvidia.com,
	Jakub Kicinski <kuba@kernel.org>,
	Shai Amiram <samiram@nvidia.com>
Subject: [PATCH net 1/7] tls: rx: device: fix checking decryption status
Date: Tue, 16 May 2023 18:50:36 -0700	[thread overview]
Message-ID: <20230517015042.1243644-2-kuba@kernel.org> (raw)
In-Reply-To: <20230517015042.1243644-1-kuba@kernel.org>

skb->len covers the entire skb, including the frag_list.
In fact we're guaranteed that rxm->full_len <= skb->len,
so since the change under Fixes we were not checking decrypt
status of any skb but the first.

Note that the skb_pagelen() added here may feel a bit costly,
but it's removed by subsequent fixes, anyway.

Reported-by: Tariq Toukan <tariqt@nvidia.com>
Fixes: 86b259f6f888 ("tls: rx: device: bound the frag walk")
Tested-by: Shai Amiram <samiram@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 net/tls/tls_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index a7cc4f9faac2..3b87c7b04ac8 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -1012,7 +1012,7 @@ int tls_device_decrypted(struct sock *sk, struct tls_context *tls_ctx)
 	struct sk_buff *skb_iter;
 	int left;
 
-	left = rxm->full_len - skb->len;
+	left = rxm->full_len + rxm->offset - skb_pagelen(skb);
 	/* Check if all the data is decrypted already */
 	skb_iter = skb_shinfo(skb)->frag_list;
 	while (skb_iter && left > 0) {
-- 
2.40.1


  reply	other threads:[~2023-05-17  1:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-17  1:50 [PATCH net 0/7] tls: rx: strp: fix inline crypto offload Jakub Kicinski
2023-05-17  1:50 ` Jakub Kicinski [this message]
2023-05-18 15:42   ` [PATCH net 1/7] tls: rx: device: fix checking decryption status Simon Horman
2023-05-17  1:50 ` [PATCH net 2/7] tls: rx: strp: set the skb->len of detached / CoW'ed skbs Jakub Kicinski
2023-05-18 15:44   ` Simon Horman
2023-05-17  1:50 ` [PATCH net 3/7] tls: rx: strp: force mixed decrypted records into copy mode Jakub Kicinski
2023-05-18 15:43   ` Simon Horman
2023-05-17  1:50 ` [PATCH net 4/7] tls: rx: strp: fix determining record length in " Jakub Kicinski
2023-05-18 15:44   ` Simon Horman
2023-05-17  1:50 ` [PATCH net 5/7] tls: rx: strp: factor out copying skb data Jakub Kicinski
2023-05-18 15:45   ` Simon Horman
2023-05-17  1:50 ` [PATCH net 6/7] tls: rx: strp: preserve decryption status of skbs when needed Jakub Kicinski
2023-05-18 15:46   ` Simon Horman
2023-05-17  1:50 ` [PATCH net 7/7] tls: rx: strp: don't use GFP_KERNEL in softirq context Jakub Kicinski
2023-05-18 15:45   ` Simon Horman
2023-05-19  7:50 ` [PATCH net 0/7] tls: rx: strp: fix inline crypto offload 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=20230517015042.1243644-2-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=borisp@nvidia.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=john.fastabend@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=samiram@nvidia.com \
    --cc=tariqt@nvidia.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 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).