diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-05-16 18:50:36 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2023-05-19 08:37:37 +0100 |
commit | b3a03b540e3cf62a255213d084d76d71c02793d5 (patch) | |
tree | 975f47943d9e52f396fc958573808a8aebf318ad | |
parent | 7e01c7f7046efc2c7c192c3619db43292b98e997 (diff) | |
download | linux-stable-b3a03b540e3cf62a255213d084d76d71c02793d5.tar.gz linux-stable-b3a03b540e3cf62a255213d084d76d71c02793d5.tar.bz2 linux-stable-b3a03b540e3cf62a255213d084d76d71c02793d5.zip |
tls: rx: device: fix checking decryption status
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>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/tls/tls_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |