Commit 32b55c5f authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by David S. Miller

net: tls: fix use-after-free with partial reads and async decrypt

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.

Fixes: fd31f399 ("tls: rx: decrypt into a fresh skb")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85905414
...@@ -63,6 +63,7 @@ struct tls_decrypt_ctx { ...@@ -63,6 +63,7 @@ struct tls_decrypt_ctx {
u8 iv[TLS_MAX_IV_SIZE]; u8 iv[TLS_MAX_IV_SIZE];
u8 aad[TLS_MAX_AAD_SIZE]; u8 aad[TLS_MAX_AAD_SIZE];
u8 tail; u8 tail;
bool free_sgout;
struct scatterlist sg[]; struct scatterlist sg[];
}; };
...@@ -187,7 +188,6 @@ static void tls_decrypt_done(void *data, int err) ...@@ -187,7 +188,6 @@ static void tls_decrypt_done(void *data, int err)
struct aead_request *aead_req = data; struct aead_request *aead_req = data;
struct crypto_aead *aead = crypto_aead_reqtfm(aead_req); struct crypto_aead *aead = crypto_aead_reqtfm(aead_req);
struct scatterlist *sgout = aead_req->dst; struct scatterlist *sgout = aead_req->dst;
struct scatterlist *sgin = aead_req->src;
struct tls_sw_context_rx *ctx; struct tls_sw_context_rx *ctx;
struct tls_decrypt_ctx *dctx; struct tls_decrypt_ctx *dctx;
struct tls_context *tls_ctx; struct tls_context *tls_ctx;
...@@ -224,7 +224,7 @@ static void tls_decrypt_done(void *data, int err) ...@@ -224,7 +224,7 @@ static void tls_decrypt_done(void *data, int err)
} }
/* Free the destination pages if skb was not decrypted inplace */ /* Free the destination pages if skb was not decrypted inplace */
if (sgout != sgin) { if (dctx->free_sgout) {
/* Skip the first S/G entry as it points to AAD */ /* Skip the first S/G entry as it points to AAD */
for_each_sg(sg_next(sgout), sg, UINT_MAX, pages) { for_each_sg(sg_next(sgout), sg, UINT_MAX, pages) {
if (!sg) if (!sg)
...@@ -1583,6 +1583,7 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov, ...@@ -1583,6 +1583,7 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov,
} else if (out_sg) { } else if (out_sg) {
memcpy(sgout, out_sg, n_sgout * sizeof(*sgout)); memcpy(sgout, out_sg, n_sgout * sizeof(*sgout));
} }
dctx->free_sgout = !!pages;
/* Prepare and submit AEAD request */ /* Prepare and submit AEAD request */
err = tls_do_decryption(sk, sgin, sgout, dctx->iv, err = tls_do_decryption(sk, sgin, sgout, dctx->iv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment