From: Sabrina Dubroca <sd@queasysnail.net>
To: netdev@vger.kernel.org
Cc: Sabrina Dubroca <sd@queasysnail.net>,
Dave Watson <davejwatson@fb.com>,
Jakub Kicinski <kuba@kernel.org>, Vakul Garg <vakul.garg@nxp.com>,
Boris Pismenny <borisp@nvidia.com>,
John Fastabend <john.fastabend@gmail.com>
Subject: [PATCH net 2/5] tls: fix use-after-free with partial reads and async decrypt
Date: Wed, 6 Sep 2023 19:08:32 +0200 [thread overview]
Message-ID: <aa1a31a25c2d0121e039f34ee58a996ea9a130ad.1694018970.git.sd@queasysnail.net> (raw)
In-Reply-To: <cover.1694018970.git.sd@queasysnail.net>
tls_decrypt_sg doesn't take a reference on the pages from clear_skb,
so the put_page() in tls_decrypt_done releases them, and we trigger a
use-after-free in process_rx_list when we try to read from the
partially-read skb.
This can be seen with the recv_and_splice test case.
Fixes: fd31f3996af2 ("tls: rx: decrypt into a fresh skb")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
---
net/tls/tls_sw.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 4f3dd0403efb..f23cceaceb36 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -63,6 +63,7 @@ struct tls_decrypt_ctx {
u8 iv[MAX_IV_SIZE];
u8 aad[TLS_MAX_AAD_SIZE];
u8 tail;
+ bool put_outsg;
struct scatterlist sg[];
};
@@ -221,7 +222,8 @@ static void tls_decrypt_done(void *data, int err)
for_each_sg(sg_next(sgout), sg, UINT_MAX, pages) {
if (!sg)
break;
- put_page(sg_page(sg));
+ if (dctx->put_outsg)
+ put_page(sg_page(sg));
}
}
@@ -1549,6 +1551,8 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov,
if (err < 0)
goto exit_free;
+ dctx->put_outsg = false;
+
if (clear_skb) {
sg_init_table(sgout, n_sgout);
sg_set_buf(&sgout[0], dctx->aad, prot->aad_size);
@@ -1558,6 +1562,8 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov,
if (err < 0)
goto exit_free;
} else if (out_iov) {
+ dctx->put_outsg = true;
+
sg_init_table(sgout, n_sgout);
sg_set_buf(&sgout[0], dctx->aad, prot->aad_size);
--
2.40.1
next prev parent reply other threads:[~2023-09-06 17:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-06 17:08 [PATCH net 0/5] tls: fix some issues with async encryption Sabrina Dubroca
2023-09-06 17:08 ` [PATCH net 1/5] net: tls: handle -EBUSY on async encrypt/decrypt requests Sabrina Dubroca
2023-09-07 1:50 ` Jakub Kicinski
2023-09-07 15:11 ` Simon Horman
2023-09-08 6:10 ` Herbert Xu
2023-09-08 15:55 ` Sabrina Dubroca
2023-09-08 21:26 ` Jakub Kicinski
2023-09-09 0:53 ` Herbert Xu
2023-09-12 4:43 ` Herbert Xu
2023-09-12 15:37 ` Sabrina Dubroca
2023-09-14 9:00 ` Herbert Xu
2023-09-06 17:08 ` Sabrina Dubroca [this message]
2023-09-07 2:05 ` [PATCH net 2/5] tls: fix use-after-free with partial reads and async decrypt Jakub Kicinski
2023-09-07 13:56 ` Sabrina Dubroca
2023-09-06 17:08 ` [PATCH net 3/5] tls: fix returned read length with async !zc decrypt Sabrina Dubroca
2023-09-06 17:08 ` [PATCH net 4/5] tls: fix race condition in async decryption of corrupted records Sabrina Dubroca
2023-09-06 17:08 ` [PATCH net 5/5] tls: don't decrypt the next record if it's of a different type Sabrina Dubroca
2023-09-07 3:47 ` Jakub Kicinski
2023-09-07 12:21 ` Sabrina Dubroca
2023-09-07 17:08 ` Jakub Kicinski
2023-09-08 6:06 ` Herbert Xu
2023-09-08 15:38 ` Sabrina Dubroca
2023-09-12 4:38 ` Herbert Xu
2023-09-13 13:25 ` Sabrina Dubroca
2023-09-14 9:45 ` Herbert Xu
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=aa1a31a25c2d0121e039f34ee58a996ea9a130ad.1694018970.git.sd@queasysnail.net \
--to=sd@queasysnail.net \
--cc=borisp@nvidia.com \
--cc=davejwatson@fb.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vakul.garg@nxp.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).