From: Greg Kroah-Hartman Date: Wed, 19 Feb 2025 06:14:48 +0000 (+0100) Subject: 6.13-stable patches X-Git-Tag: v6.1.129~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3972340cc0fde63d420fc2736f72dcd2cd90cded;p=thirdparty%2Fkernel%2Fstable-queue.git 6.13-stable patches added patches: io_uring-kbuf-reallocate-buf-lists-on-upgrade.patch vsock-keep-the-binding-until-socket-destruction.patch vsock-orphan-socket-after-transport-release.patch --- diff --git a/queue-6.13/io_uring-kbuf-reallocate-buf-lists-on-upgrade.patch b/queue-6.13/io_uring-kbuf-reallocate-buf-lists-on-upgrade.patch new file mode 100644 index 0000000000..4adbfcefa4 --- /dev/null +++ b/queue-6.13/io_uring-kbuf-reallocate-buf-lists-on-upgrade.patch @@ -0,0 +1,57 @@ +From 8802766324e1f5d414a81ac43365c20142e85603 Mon Sep 17 00:00:00 2001 +From: Pavel Begunkov +Date: Wed, 12 Feb 2025 13:46:46 +0000 +Subject: io_uring/kbuf: reallocate buf lists on upgrade + +From: Pavel Begunkov + +commit 8802766324e1f5d414a81ac43365c20142e85603 upstream. + +IORING_REGISTER_PBUF_RING can reuse an old struct io_buffer_list if it +was created for legacy selected buffer and has been emptied. It violates +the requirement that most of the field should stay stable after publish. +Always reallocate it instead. + +Cc: stable@vger.kernel.org +Reported-by: Pumpkin Chang +Fixes: 2fcabce2d7d34 ("io_uring: disallow mixed provided buffer group registrations") +Signed-off-by: Pavel Begunkov +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/kbuf.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +--- a/io_uring/kbuf.c ++++ b/io_uring/kbuf.c +@@ -420,6 +420,12 @@ void io_destroy_buffers(struct io_ring_c + } + } + ++static void io_destroy_bl(struct io_ring_ctx *ctx, struct io_buffer_list *bl) ++{ ++ xa_erase(&ctx->io_bl_xa, bl->bgid); ++ io_put_bl(ctx, bl); ++} ++ + int io_remove_buffers_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) + { + struct io_provide_buf *p = io_kiocb_to_cmd(req, struct io_provide_buf); +@@ -717,12 +723,13 @@ int io_register_pbuf_ring(struct io_ring + /* if mapped buffer ring OR classic exists, don't allow */ + if (bl->flags & IOBL_BUF_RING || !list_empty(&bl->buf_list)) + return -EEXIST; +- } else { +- free_bl = bl = kzalloc(sizeof(*bl), GFP_KERNEL); +- if (!bl) +- return -ENOMEM; ++ io_destroy_bl(ctx, bl); + } + ++ free_bl = bl = kzalloc(sizeof(*bl), GFP_KERNEL); ++ if (!bl) ++ return -ENOMEM; ++ + if (!(reg.flags & IOU_PBUF_RING_MMAP)) + ret = io_pin_pbuf_ring(®, bl); + else diff --git a/queue-6.13/series b/queue-6.13/series index 7cb701719c..bd575787ae 100644 --- a/queue-6.13/series +++ b/queue-6.13/series @@ -268,3 +268,6 @@ cpufreq-amd-pstate-remove-the-goto-label-in-amd_pstate_update_limits.patch net-ipv6-fix-dst-refleaks-in-rpl-seg6-and-ioam6-lwtunnels.patch scsi-ufs-core-ensure-clk_gating.lock-is-used-only-after-initialization.patch sched_ext-fix-incorrect-assumption-about-migration-disabled-tasks-in-task_can_run_on_remote_rq.patch +io_uring-kbuf-reallocate-buf-lists-on-upgrade.patch +vsock-keep-the-binding-until-socket-destruction.patch +vsock-orphan-socket-after-transport-release.patch diff --git a/queue-6.13/vsock-keep-the-binding-until-socket-destruction.patch b/queue-6.13/vsock-keep-the-binding-until-socket-destruction.patch new file mode 100644 index 0000000000..e6de7c894a --- /dev/null +++ b/queue-6.13/vsock-keep-the-binding-until-socket-destruction.patch @@ -0,0 +1,131 @@ +From fcdd2242c0231032fc84e1404315c245ae56322a Mon Sep 17 00:00:00 2001 +From: Michal Luczaj +Date: Tue, 28 Jan 2025 14:15:27 +0100 +Subject: vsock: Keep the binding until socket destruction + +From: Michal Luczaj + +commit fcdd2242c0231032fc84e1404315c245ae56322a upstream. + +Preserve sockets bindings; this includes both resulting from an explicit +bind() and those implicitly bound through autobind during connect(). + +Prevents socket unbinding during a transport reassignment, which fixes a +use-after-free: + + 1. vsock_create() (refcnt=1) calls vsock_insert_unbound() (refcnt=2) + 2. transport->release() calls vsock_remove_bound() without checking if + sk was bound and moved to bound list (refcnt=1) + 3. vsock_bind() assumes sk is in unbound list and before + __vsock_insert_bound(vsock_bound_sockets()) calls + __vsock_remove_bound() which does: + list_del_init(&vsk->bound_table); // nop + sock_put(&vsk->sk); // refcnt=0 + +BUG: KASAN: slab-use-after-free in __vsock_bind+0x62e/0x730 +Read of size 4 at addr ffff88816b46a74c by task a.out/2057 + dump_stack_lvl+0x68/0x90 + print_report+0x174/0x4f6 + kasan_report+0xb9/0x190 + __vsock_bind+0x62e/0x730 + vsock_bind+0x97/0xe0 + __sys_bind+0x154/0x1f0 + __x64_sys_bind+0x6e/0xb0 + do_syscall_64+0x93/0x1b0 + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +Allocated by task 2057: + kasan_save_stack+0x1e/0x40 + kasan_save_track+0x10/0x30 + __kasan_slab_alloc+0x85/0x90 + kmem_cache_alloc_noprof+0x131/0x450 + sk_prot_alloc+0x5b/0x220 + sk_alloc+0x2c/0x870 + __vsock_create.constprop.0+0x2e/0xb60 + vsock_create+0xe4/0x420 + __sock_create+0x241/0x650 + __sys_socket+0xf2/0x1a0 + __x64_sys_socket+0x6e/0xb0 + do_syscall_64+0x93/0x1b0 + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +Freed by task 2057: + kasan_save_stack+0x1e/0x40 + kasan_save_track+0x10/0x30 + kasan_save_free_info+0x37/0x60 + __kasan_slab_free+0x4b/0x70 + kmem_cache_free+0x1a1/0x590 + __sk_destruct+0x388/0x5a0 + __vsock_bind+0x5e1/0x730 + vsock_bind+0x97/0xe0 + __sys_bind+0x154/0x1f0 + __x64_sys_bind+0x6e/0xb0 + do_syscall_64+0x93/0x1b0 + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +refcount_t: addition on 0; use-after-free. +WARNING: CPU: 7 PID: 2057 at lib/refcount.c:25 refcount_warn_saturate+0xce/0x150 +RIP: 0010:refcount_warn_saturate+0xce/0x150 + __vsock_bind+0x66d/0x730 + vsock_bind+0x97/0xe0 + __sys_bind+0x154/0x1f0 + __x64_sys_bind+0x6e/0xb0 + do_syscall_64+0x93/0x1b0 + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +refcount_t: underflow; use-after-free. +WARNING: CPU: 7 PID: 2057 at lib/refcount.c:28 refcount_warn_saturate+0xee/0x150 +RIP: 0010:refcount_warn_saturate+0xee/0x150 + vsock_remove_bound+0x187/0x1e0 + __vsock_release+0x383/0x4a0 + vsock_release+0x90/0x120 + __sock_release+0xa3/0x250 + sock_close+0x14/0x20 + __fput+0x359/0xa80 + task_work_run+0x107/0x1d0 + do_exit+0x847/0x2560 + do_group_exit+0xb8/0x250 + __x64_sys_exit_group+0x3a/0x50 + x64_sys_call+0xfec/0x14f0 + do_syscall_64+0x93/0x1b0 + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +Fixes: c0cfa2d8a788 ("vsock: add multi-transports support") +Reviewed-by: Stefano Garzarella +Signed-off-by: Michal Luczaj +Link: https://patch.msgid.link/20250128-vsock-transport-vs-autobind-v3-1-1cf57065b770@rbox.co +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/vmw_vsock/af_vsock.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/net/vmw_vsock/af_vsock.c ++++ b/net/vmw_vsock/af_vsock.c +@@ -337,7 +337,10 @@ EXPORT_SYMBOL_GPL(vsock_find_connected_s + + void vsock_remove_sock(struct vsock_sock *vsk) + { +- vsock_remove_bound(vsk); ++ /* Transport reassignment must not remove the binding. */ ++ if (sock_flag(sk_vsock(vsk), SOCK_DEAD)) ++ vsock_remove_bound(vsk); ++ + vsock_remove_connected(vsk); + } + EXPORT_SYMBOL_GPL(vsock_remove_sock); +@@ -821,12 +824,13 @@ static void __vsock_release(struct sock + */ + lock_sock_nested(sk, level); + ++ sock_orphan(sk); ++ + if (vsk->transport) + vsk->transport->release(vsk); + else if (sock_type_connectible(sk->sk_type)) + vsock_remove_sock(vsk); + +- sock_orphan(sk); + sk->sk_shutdown = SHUTDOWN_MASK; + + skb_queue_purge(&sk->sk_receive_queue); diff --git a/queue-6.13/vsock-orphan-socket-after-transport-release.patch b/queue-6.13/vsock-orphan-socket-after-transport-release.patch new file mode 100644 index 0000000000..353fd106af --- /dev/null +++ b/queue-6.13/vsock-orphan-socket-after-transport-release.patch @@ -0,0 +1,67 @@ +From 78dafe1cf3afa02ed71084b350713b07e72a18fb Mon Sep 17 00:00:00 2001 +From: Michal Luczaj +Date: Mon, 10 Feb 2025 13:15:00 +0100 +Subject: vsock: Orphan socket after transport release + +From: Michal Luczaj + +commit 78dafe1cf3afa02ed71084b350713b07e72a18fb upstream. + +During socket release, sock_orphan() is called without considering that it +sets sk->sk_wq to NULL. Later, if SO_LINGER is enabled, this leads to a +null pointer dereferenced in virtio_transport_wait_close(). + +Orphan the socket only after transport release. + +Partially reverts the 'Fixes:' commit. + +KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] + lock_acquire+0x19e/0x500 + _raw_spin_lock_irqsave+0x47/0x70 + add_wait_queue+0x46/0x230 + virtio_transport_release+0x4e7/0x7f0 + __vsock_release+0xfd/0x490 + vsock_release+0x90/0x120 + __sock_release+0xa3/0x250 + sock_close+0x14/0x20 + __fput+0x35e/0xa90 + __x64_sys_close+0x78/0xd0 + do_syscall_64+0x93/0x1b0 + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +Reported-by: syzbot+9d55b199192a4be7d02c@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=9d55b199192a4be7d02c +Fixes: fcdd2242c023 ("vsock: Keep the binding until socket destruction") +Tested-by: Luigi Leonardi +Reviewed-by: Luigi Leonardi +Signed-off-by: Michal Luczaj +Link: https://patch.msgid.link/20250210-vsock-linger-nullderef-v3-1-ef6244d02b54@rbox.co +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/vmw_vsock/af_vsock.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/net/vmw_vsock/af_vsock.c ++++ b/net/vmw_vsock/af_vsock.c +@@ -824,13 +824,19 @@ static void __vsock_release(struct sock + */ + lock_sock_nested(sk, level); + +- sock_orphan(sk); ++ /* Indicate to vsock_remove_sock() that the socket is being released and ++ * can be removed from the bound_table. Unlike transport reassignment ++ * case, where the socket must remain bound despite vsock_remove_sock() ++ * being called from the transport release() callback. ++ */ ++ sock_set_flag(sk, SOCK_DEAD); + + if (vsk->transport) + vsk->transport->release(vsk); + else if (sock_type_connectible(sk->sk_type)) + vsock_remove_sock(vsk); + ++ sock_orphan(sk); + sk->sk_shutdown = SHUTDOWN_MASK; + + skb_queue_purge(&sk->sk_receive_queue);