tls: rx: device: fix checking decryption status
authorJakub Kicinski <kuba@kernel.org>
Wed, 17 May 2023 01:50:36 +0000 (18:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Jun 2023 07:26:17 +0000 (09:26 +0200)
[ Upstream commit b3a03b540e3cf62a255213d084d76d71c02793d5 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/tls/tls_device.c

index a7cc4f9..3b87c7b 100644 (file)
@@ -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) {