io_uring/af_unix: defer registered files gc to io_uring release
authorPavel Begunkov <asml.silence@gmail.com>
Sun, 16 Oct 2022 22:31:26 +0000 (23:31 +0100)
committerSalvatore Bonaccorso <carnil@debian.org>
Fri, 21 Oct 2022 20:24:21 +0000 (21:24 +0100)
commitcf0bb1c58f7ffe48443b6deebf3dc5b82efee9b5
tree3b6d2b767bb7a1d93daa3a6c33b379cef4762204
parent8ccb4bae72b98e67203c08cfa3cdaf848a37817b
io_uring/af_unix: defer registered files gc to io_uring release

Origin: https://git.kernel.org/linus/0091bfc81741b8d3aeb3b7ab8636f911b2de6e80
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2022-2602

[ upstream commit 0091bfc81741b8d3aeb3b7ab8636f911b2de6e80 ]

Instead of putting io_uring's registered files in unix_gc() we want it
to be done by io_uring itself. The trick here is to consider io_uring
registered files for cycle detection but not actually putting them down.
Because io_uring can't register other ring instances, this will remove
all refs to the ring file triggering the ->release path and clean up
with io_ring_ctx_free().

Cc: stable@vger.kernel.org
Fixes: 6b06314c47e1 ("io_uring: add file set registration")
Reported-and-tested-by: David Bouman <dbouman03@gmail.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
[axboe: add kerneldoc comment to skb, fold in skb leak fix]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name io_uring-af_unix-defer-registered-files-gc-to-io_uring-release.patch
fs/io_uring.c
include/linux/skbuff.h
net/unix/garbage.c