Skip to content

Commit 5e8a5c3

Browse files
borkmanngregkh
authored andcommitted
tls: fix use-after-free in tls_push_record
[ Upstream commit a447da7 ] syzkaller managed to trigger a use-after-free in tls like the following: BUG: KASAN: use-after-free in tls_push_record.constprop.15+0x6a2/0x810 [tls] Write of size 1 at addr ffff88037aa08000 by task a.out/2317 CPU: 3 PID: 2317 Comm: a.out Not tainted 4.17.0+ #144 Hardware name: LENOVO 20FBCTO1WW/20FBCTO1WW, BIOS N1FET47W (1.21 ) 11/28/2016 Call Trace: dump_stack+0x71/0xab print_address_description+0x6a/0x280 kasan_report+0x258/0x380 ? tls_push_record.constprop.15+0x6a2/0x810 [tls] tls_push_record.constprop.15+0x6a2/0x810 [tls] tls_sw_push_pending_record+0x2e/0x40 [tls] tls_sk_proto_close+0x3fe/0x710 [tls] ? tcp_check_oom+0x4c0/0x4c0 ? tls_write_space+0x260/0x260 [tls] ? kmem_cache_free+0x88/0x1f0 inet_release+0xd6/0x1b0 __sock_release+0xc0/0x240 sock_close+0x11/0x20 __fput+0x22d/0x660 task_work_run+0x114/0x1a0 do_exit+0x71a/0x2780 ? mm_update_next_owner+0x650/0x650 ? handle_mm_fault+0x2f5/0x5f0 ? __do_page_fault+0x44f/0xa50 ? mm_fault_error+0x2d0/0x2d0 do_group_exit+0xde/0x300 __x64_sys_exit_group+0x3a/0x50 do_syscall_64+0x9a/0x300 ? page_fault+0x8/0x30 entry_SYSCALL_64_after_hwframe+0x44/0xa9 This happened through fault injection where aead_req allocation in tls_do_encryption() eventually failed and we returned -ENOMEM from the function. Turns out that the use-after-free is triggered from tls_sw_sendmsg() in the second tls_push_record(). The error then triggers a jump to waiting for memory in sk_stream_wait_memory() resp. returning immediately in case of MSG_DONTWAIT. What follows is the trim_both_sgl(sk, orig_size), which drops elements from the sg list added via tls_sw_sendmsg(). Now the use-after-free gets triggered when the socket is being closed, where tls_sk_proto_close() callback is invoked. The tls_complete_pending_work() will figure that there's a pending closed tls record to be flushed and thus calls into the tls_push_pending_closed_record() from there. ctx->push_pending_record() is called from the latter, which is the tls_sw_push_pending_record() from sw path. This again calls into tls_push_record(). And here the tls_fill_prepend() will panic since the buffer address has been freed earlier via trim_both_sgl(). One way to fix it is to move the aead request allocation out of tls_do_encryption() early into tls_push_record(). This means we don't prep the tls header and advance state to the TLS_PENDING_CLOSED_RECORD before allocation which could potentially fail happened. That fixes the issue on my side. Fixes: 3c4d755 ("tls: kernel TLS support") Reported-by: syzbot+5c74af81c547738e1684@syzkaller.appspotmail.com Reported-by: syzbot+709f2810a6a05f11d4d3@syzkaller.appspotmail.com Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Dave Watson <davejwatson@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 244c10f commit 5e8a5c3

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

net/tls/tls_sw.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,12 @@ static void tls_free_both_sg(struct sock *sk)
211211
}
212212

213213
static int tls_do_encryption(struct tls_context *tls_ctx,
214-
struct tls_sw_context *ctx, size_t data_len,
215-
gfp_t flags)
214+
struct tls_sw_context *ctx,
215+
struct aead_request *aead_req,
216+
size_t data_len)
216217
{
217-
unsigned int req_size = sizeof(struct aead_request) +
218-
crypto_aead_reqsize(ctx->aead_send);
219-
struct aead_request *aead_req;
220218
int rc;
221219

222-
aead_req = kzalloc(req_size, flags);
223-
if (!aead_req)
224-
return -ENOMEM;
225-
226220
ctx->sg_encrypted_data[0].offset += tls_ctx->prepend_size;
227221
ctx->sg_encrypted_data[0].length -= tls_ctx->prepend_size;
228222

@@ -235,7 +229,6 @@ static int tls_do_encryption(struct tls_context *tls_ctx,
235229
ctx->sg_encrypted_data[0].offset -= tls_ctx->prepend_size;
236230
ctx->sg_encrypted_data[0].length += tls_ctx->prepend_size;
237231

238-
kfree(aead_req);
239232
return rc;
240233
}
241234

@@ -244,8 +237,14 @@ static int tls_push_record(struct sock *sk, int flags,
244237
{
245238
struct tls_context *tls_ctx = tls_get_ctx(sk);
246239
struct tls_sw_context *ctx = tls_sw_ctx(tls_ctx);
240+
struct aead_request *req;
247241
int rc;
248242

243+
req = kzalloc(sizeof(struct aead_request) +
244+
crypto_aead_reqsize(ctx->aead_send), sk->sk_allocation);
245+
if (!req)
246+
return -ENOMEM;
247+
249248
sg_mark_end(ctx->sg_plaintext_data + ctx->sg_plaintext_num_elem - 1);
250249
sg_mark_end(ctx->sg_encrypted_data + ctx->sg_encrypted_num_elem - 1);
251250

@@ -261,15 +260,14 @@ static int tls_push_record(struct sock *sk, int flags,
261260
tls_ctx->pending_open_record_frags = 0;
262261
set_bit(TLS_PENDING_CLOSED_RECORD, &tls_ctx->flags);
263262

264-
rc = tls_do_encryption(tls_ctx, ctx, ctx->sg_plaintext_size,
265-
sk->sk_allocation);
263+
rc = tls_do_encryption(tls_ctx, ctx, req, ctx->sg_plaintext_size);
266264
if (rc < 0) {
267265
/* If we are called from write_space and
268266
* we fail, we need to set this SOCK_NOSPACE
269267
* to trigger another write_space in the future.
270268
*/
271269
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
272-
return rc;
270+
goto out_req;
273271
}
274272

275273
free_sg(sk, ctx->sg_plaintext_data, &ctx->sg_plaintext_num_elem,
@@ -284,6 +282,8 @@ static int tls_push_record(struct sock *sk, int flags,
284282
tls_err_abort(sk);
285283

286284
tls_advance_record_sn(sk, tls_ctx);
285+
out_req:
286+
kfree(req);
287287
return rc;
288288
}
289289

0 commit comments

Comments
 (0)