2024-06-15 16:02:09 -03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
/*
|
|
|
|
* NET3: Garbage Collector For AF_UNIX sockets
|
|
|
|
*
|
|
|
|
* Garbage Collector:
|
|
|
|
* Copyright (C) Barak A. Pearlmutter.
|
|
|
|
*
|
|
|
|
* Chopped about by Alan Cox 22/3/96 to make it fit the AF_UNIX socket problem.
|
|
|
|
* If it doesn't work blame me, it worked when Barak sent it.
|
|
|
|
*
|
|
|
|
* Assumptions:
|
|
|
|
*
|
|
|
|
* - object w/ a bit
|
|
|
|
* - free list
|
|
|
|
*
|
|
|
|
* Current optimizations:
|
|
|
|
*
|
|
|
|
* - explicit stack instead of recursion
|
|
|
|
* - tail recurse on first born instead of immediate push/pop
|
|
|
|
* - we gather the stuff that should not be killed into tree
|
|
|
|
* and stack is just a path from root to the current pointer.
|
|
|
|
*
|
|
|
|
* Future optimizations:
|
|
|
|
*
|
|
|
|
* - don't just push entire root set; process in place
|
|
|
|
*
|
|
|
|
* Fixes:
|
|
|
|
* Alan Cox 07 Sept 1997 Vmalloc internal stack as needed.
|
|
|
|
* Cope with changing max_files.
|
|
|
|
* Al Viro 11 Oct 1998
|
|
|
|
* Graph may have cycles. That is, we can send the descriptor
|
|
|
|
* of foo to bar and vice versa. Current code chokes on that.
|
|
|
|
* Fix: move SCM_RIGHTS ones into the separate list and then
|
|
|
|
* skb_free() them all instead of doing explicit fput's.
|
|
|
|
* Another problem: since fput() may block somebody may
|
|
|
|
* create a new unix_socket when we are in the middle of sweep
|
|
|
|
* phase. Fix: revert the logic wrt MARKED. Mark everything
|
|
|
|
* upon the beginning and unmark non-junk ones.
|
|
|
|
*
|
|
|
|
* [12 Oct 1998] AAARGH! New code purges all SCM_RIGHTS
|
|
|
|
* sent to connect()'ed but still not accept()'ed sockets.
|
|
|
|
* Fixed. Old code had slightly different problem here:
|
|
|
|
* extra fput() in situation when we passed the descriptor via
|
|
|
|
* such socket and closed it (descriptor). That would happen on
|
|
|
|
* each unix_gc() until the accept(). Since the struct file in
|
|
|
|
* question would go to the free list and might be reused...
|
|
|
|
* That might be the reason of random oopses on filp_close()
|
|
|
|
* in unrelated processes.
|
|
|
|
*
|
|
|
|
* AV 28 Feb 1999
|
|
|
|
* Kill the explicit allocation of stack. Now we keep the tree
|
|
|
|
* with root in dummy + pointer (gc_current) to one of the nodes.
|
|
|
|
* Stack is represented as path from gc_current to dummy. Unmark
|
|
|
|
* now means "add to tree". Push == "make it a son of gc_current".
|
|
|
|
* Pop == "move gc_current to parent". We keep only pointers to
|
|
|
|
* parents (->gc_tree).
|
|
|
|
* AV 1 Mar 1999
|
|
|
|
* Damn. Added missing check for ->dead in listen queues scanning.
|
|
|
|
*
|
|
|
|
* Miklos Szeredi 25 Jun 2007
|
|
|
|
* Reimplement with a cycle collecting algorithm. This should
|
|
|
|
* solve several problems with the previous code, like being racy
|
|
|
|
* wrt receive and holding up unrelated socket operations.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/socket.h>
|
|
|
|
#include <linux/un.h>
|
|
|
|
#include <linux/net.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/file.h>
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
|
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/af_unix.h>
|
|
|
|
#include <net/scm.h>
|
|
|
|
#include <net/tcp_states.h>
|
|
|
|
|
|
|
|
#include "scm.h"
|
|
|
|
|
|
|
|
/* Internal data structures and random procedures: */
|
|
|
|
|
|
|
|
static LIST_HEAD(gc_candidates);
|
|
|
|
static DECLARE_WAIT_QUEUE_HEAD(unix_gc_wait);
|
|
|
|
|
|
|
|
static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *),
|
|
|
|
struct sk_buff_head *hitlist)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct sk_buff *next;
|
|
|
|
|
|
|
|
spin_lock(&x->sk_receive_queue.lock);
|
|
|
|
skb_queue_walk_safe(&x->sk_receive_queue, skb, next) {
|
|
|
|
/* Do we have file descriptors ? */
|
|
|
|
if (UNIXCB(skb).fp) {
|
|
|
|
bool hit = false;
|
|
|
|
/* Process the descriptors of this socket */
|
|
|
|
int nfd = UNIXCB(skb).fp->count;
|
|
|
|
struct file **fp = UNIXCB(skb).fp->fp;
|
|
|
|
|
|
|
|
while (nfd--) {
|
|
|
|
/* Get the socket the fd matches if it indeed does so */
|
|
|
|
struct sock *sk = unix_get_socket(*fp++);
|
|
|
|
|
|
|
|
if (sk) {
|
|
|
|
struct unix_sock *u = unix_sk(sk);
|
|
|
|
|
|
|
|
/* Ignore non-candidates, they could
|
|
|
|
* have been added to the queues after
|
|
|
|
* starting the garbage collection
|
|
|
|
*/
|
|
|
|
if (test_bit(UNIX_GC_CANDIDATE, &u->gc_flags)) {
|
|
|
|
hit = true;
|
|
|
|
|
|
|
|
func(u);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (hit && hitlist != NULL) {
|
|
|
|
__skb_unlink(skb, &x->sk_receive_queue);
|
|
|
|
__skb_queue_tail(hitlist, skb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock(&x->sk_receive_queue.lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void scan_children(struct sock *x, void (*func)(struct unix_sock *),
|
|
|
|
struct sk_buff_head *hitlist)
|
|
|
|
{
|
|
|
|
if (x->sk_state != TCP_LISTEN) {
|
|
|
|
scan_inflight(x, func, hitlist);
|
|
|
|
} else {
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct sk_buff *next;
|
|
|
|
struct unix_sock *u;
|
|
|
|
LIST_HEAD(embryos);
|
|
|
|
|
|
|
|
/* For a listening socket collect the queued embryos
|
|
|
|
* and perform a scan on them as well.
|
|
|
|
*/
|
|
|
|
spin_lock(&x->sk_receive_queue.lock);
|
|
|
|
skb_queue_walk_safe(&x->sk_receive_queue, skb, next) {
|
|
|
|
u = unix_sk(skb->sk);
|
|
|
|
|
|
|
|
/* An embryo cannot be in-flight, so it's safe
|
|
|
|
* to use the list link.
|
|
|
|
*/
|
|
|
|
BUG_ON(!list_empty(&u->link));
|
|
|
|
list_add_tail(&u->link, &embryos);
|
|
|
|
}
|
|
|
|
spin_unlock(&x->sk_receive_queue.lock);
|
|
|
|
|
|
|
|
while (!list_empty(&embryos)) {
|
|
|
|
u = list_entry(embryos.next, struct unix_sock, link);
|
|
|
|
scan_inflight(&u->sk, func, hitlist);
|
|
|
|
list_del_init(&u->link);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dec_inflight(struct unix_sock *usk)
|
|
|
|
{
|
2024-01-23 09:08:53 -08:00
|
|
|
usk->inflight--;
|
2024-06-15 16:02:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void inc_inflight(struct unix_sock *usk)
|
|
|
|
{
|
2024-01-23 09:08:53 -08:00
|
|
|
usk->inflight++;
|
2024-06-15 16:02:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void inc_inflight_move_tail(struct unix_sock *u)
|
|
|
|
{
|
2024-01-23 09:08:53 -08:00
|
|
|
u->inflight++;
|
|
|
|
|
2024-06-15 16:02:09 -03:00
|
|
|
/* If this still might be part of a cycle, move it to the end
|
|
|
|
* of the list, so that it's checked even if it was already
|
|
|
|
* passed over
|
|
|
|
*/
|
|
|
|
if (test_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags))
|
|
|
|
list_move_tail(&u->link, &gc_candidates);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool gc_in_progress;
|
|
|
|
#define UNIX_INFLIGHT_TRIGGER_GC 16000
|
|
|
|
|
|
|
|
void wait_for_unix_gc(void)
|
|
|
|
{
|
|
|
|
/* If number of inflight sockets is insane,
|
|
|
|
* force a garbage collect right now.
|
|
|
|
* Paired with the WRITE_ONCE() in unix_inflight(),
|
|
|
|
* unix_notinflight() and gc_in_progress().
|
|
|
|
*/
|
|
|
|
if (READ_ONCE(unix_tot_inflight) > UNIX_INFLIGHT_TRIGGER_GC &&
|
|
|
|
!READ_ONCE(gc_in_progress))
|
|
|
|
unix_gc();
|
2024-01-23 09:08:52 -08:00
|
|
|
wait_event(unix_gc_wait, !READ_ONCE(gc_in_progress));
|
2024-06-15 16:02:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The external entry point: unix_gc() */
|
|
|
|
void unix_gc(void)
|
|
|
|
{
|
|
|
|
struct sk_buff *next_skb, *skb;
|
|
|
|
struct unix_sock *u;
|
|
|
|
struct unix_sock *next;
|
|
|
|
struct sk_buff_head hitlist;
|
|
|
|
struct list_head cursor;
|
|
|
|
LIST_HEAD(not_cycle_list);
|
|
|
|
|
|
|
|
spin_lock(&unix_gc_lock);
|
|
|
|
|
|
|
|
/* Avoid a recursive GC. */
|
|
|
|
if (gc_in_progress)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Paired with READ_ONCE() in wait_for_unix_gc(). */
|
|
|
|
WRITE_ONCE(gc_in_progress, true);
|
|
|
|
|
|
|
|
/* First, select candidates for garbage collection. Only
|
|
|
|
* in-flight sockets are considered, and from those only ones
|
|
|
|
* which don't have any external reference.
|
|
|
|
*
|
|
|
|
* Holding unix_gc_lock will protect these candidates from
|
|
|
|
* being detached, and hence from gaining an external
|
|
|
|
* reference. Since there are no possible receivers, all
|
|
|
|
* buffers currently on the candidates' queues stay there
|
|
|
|
* during the garbage collection.
|
|
|
|
*
|
|
|
|
* We also know that no new candidate can be added onto the
|
|
|
|
* receive queues. Other, non candidate sockets _can_ be
|
|
|
|
* added to queue, so we must make sure only to touch
|
|
|
|
* candidates.
|
af_unix: Fix garbage collector racing against connect()
[ Upstream commit 47d8ac011fe1c9251070e1bd64cb10b48193ec51 ]
Garbage collector does not take into account the risk of embryo getting
enqueued during the garbage collection. If such embryo has a peer that
carries SCM_RIGHTS, two consecutive passes of scan_children() may see a
different set of children. Leading to an incorrectly elevated inflight
count, and then a dangling pointer within the gc_inflight_list.
sockets are AF_UNIX/SOCK_STREAM
S is an unconnected socket
L is a listening in-flight socket bound to addr, not in fdtable
V's fd will be passed via sendmsg(), gets inflight count bumped
connect(S, addr) sendmsg(S, [V]); close(V) __unix_gc()
---------------- ------------------------- -----------
NS = unix_create1()
skb1 = sock_wmalloc(NS)
L = unix_find_other(addr)
unix_state_lock(L)
unix_peer(S) = NS
// V count=1 inflight=0
NS = unix_peer(S)
skb2 = sock_alloc()
skb_queue_tail(NS, skb2[V])
// V became in-flight
// V count=2 inflight=1
close(V)
// V count=1 inflight=1
// GC candidate condition met
for u in gc_inflight_list:
if (total_refs == inflight_refs)
add u to gc_candidates
// gc_candidates={L, V}
for u in gc_candidates:
scan_children(u, dec_inflight)
// embryo (skb1) was not
// reachable from L yet, so V's
// inflight remains unchanged
__skb_queue_tail(L, skb1)
unix_state_unlock(L)
for u in gc_candidates:
if (u.inflight)
scan_children(u, inc_inflight_move_tail)
// V count=1 inflight=2 (!)
If there is a GC-candidate listening socket, lock/unlock its state. This
makes GC wait until the end of any ongoing connect() to that socket. After
flipping the lock, a possibly SCM-laden embryo is already enqueued. And if
there is another embryo coming, it can not possibly carry SCM_RIGHTS. At
this point, unix_inflight() can not happen because unix_gc_lock is already
taken. Inflight graph remains unaffected.
Fixes: 1fd05ba5a2f2 ("[AF_UNIX]: Rewrite garbage collector, fixes race.")
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240409201047.1032217-1-mhal@rbox.co
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-09 22:09:39 +02:00
|
|
|
*
|
|
|
|
* Embryos, though never candidates themselves, affect which
|
|
|
|
* candidates are reachable by the garbage collector. Before
|
|
|
|
* being added to a listener's queue, an embryo may already
|
|
|
|
* receive data carrying SCM_RIGHTS, potentially making the
|
|
|
|
* passed socket a candidate that is not yet reachable by the
|
|
|
|
* collector. It becomes reachable once the embryo is
|
|
|
|
* enqueued. Therefore, we must ensure that no SCM-laden
|
|
|
|
* embryo appears in a (candidate) listener's queue between
|
|
|
|
* consecutive scan_children() calls.
|
2024-06-15 16:02:09 -03:00
|
|
|
*/
|
|
|
|
list_for_each_entry_safe(u, next, &gc_inflight_list, link) {
|
af_unix: Fix garbage collector racing against connect()
[ Upstream commit 47d8ac011fe1c9251070e1bd64cb10b48193ec51 ]
Garbage collector does not take into account the risk of embryo getting
enqueued during the garbage collection. If such embryo has a peer that
carries SCM_RIGHTS, two consecutive passes of scan_children() may see a
different set of children. Leading to an incorrectly elevated inflight
count, and then a dangling pointer within the gc_inflight_list.
sockets are AF_UNIX/SOCK_STREAM
S is an unconnected socket
L is a listening in-flight socket bound to addr, not in fdtable
V's fd will be passed via sendmsg(), gets inflight count bumped
connect(S, addr) sendmsg(S, [V]); close(V) __unix_gc()
---------------- ------------------------- -----------
NS = unix_create1()
skb1 = sock_wmalloc(NS)
L = unix_find_other(addr)
unix_state_lock(L)
unix_peer(S) = NS
// V count=1 inflight=0
NS = unix_peer(S)
skb2 = sock_alloc()
skb_queue_tail(NS, skb2[V])
// V became in-flight
// V count=2 inflight=1
close(V)
// V count=1 inflight=1
// GC candidate condition met
for u in gc_inflight_list:
if (total_refs == inflight_refs)
add u to gc_candidates
// gc_candidates={L, V}
for u in gc_candidates:
scan_children(u, dec_inflight)
// embryo (skb1) was not
// reachable from L yet, so V's
// inflight remains unchanged
__skb_queue_tail(L, skb1)
unix_state_unlock(L)
for u in gc_candidates:
if (u.inflight)
scan_children(u, inc_inflight_move_tail)
// V count=1 inflight=2 (!)
If there is a GC-candidate listening socket, lock/unlock its state. This
makes GC wait until the end of any ongoing connect() to that socket. After
flipping the lock, a possibly SCM-laden embryo is already enqueued. And if
there is another embryo coming, it can not possibly carry SCM_RIGHTS. At
this point, unix_inflight() can not happen because unix_gc_lock is already
taken. Inflight graph remains unaffected.
Fixes: 1fd05ba5a2f2 ("[AF_UNIX]: Rewrite garbage collector, fixes race.")
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240409201047.1032217-1-mhal@rbox.co
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-09 22:09:39 +02:00
|
|
|
struct sock *sk = &u->sk;
|
2024-06-15 16:02:09 -03:00
|
|
|
long total_refs;
|
|
|
|
|
af_unix: Fix garbage collector racing against connect()
[ Upstream commit 47d8ac011fe1c9251070e1bd64cb10b48193ec51 ]
Garbage collector does not take into account the risk of embryo getting
enqueued during the garbage collection. If such embryo has a peer that
carries SCM_RIGHTS, two consecutive passes of scan_children() may see a
different set of children. Leading to an incorrectly elevated inflight
count, and then a dangling pointer within the gc_inflight_list.
sockets are AF_UNIX/SOCK_STREAM
S is an unconnected socket
L is a listening in-flight socket bound to addr, not in fdtable
V's fd will be passed via sendmsg(), gets inflight count bumped
connect(S, addr) sendmsg(S, [V]); close(V) __unix_gc()
---------------- ------------------------- -----------
NS = unix_create1()
skb1 = sock_wmalloc(NS)
L = unix_find_other(addr)
unix_state_lock(L)
unix_peer(S) = NS
// V count=1 inflight=0
NS = unix_peer(S)
skb2 = sock_alloc()
skb_queue_tail(NS, skb2[V])
// V became in-flight
// V count=2 inflight=1
close(V)
// V count=1 inflight=1
// GC candidate condition met
for u in gc_inflight_list:
if (total_refs == inflight_refs)
add u to gc_candidates
// gc_candidates={L, V}
for u in gc_candidates:
scan_children(u, dec_inflight)
// embryo (skb1) was not
// reachable from L yet, so V's
// inflight remains unchanged
__skb_queue_tail(L, skb1)
unix_state_unlock(L)
for u in gc_candidates:
if (u.inflight)
scan_children(u, inc_inflight_move_tail)
// V count=1 inflight=2 (!)
If there is a GC-candidate listening socket, lock/unlock its state. This
makes GC wait until the end of any ongoing connect() to that socket. After
flipping the lock, a possibly SCM-laden embryo is already enqueued. And if
there is another embryo coming, it can not possibly carry SCM_RIGHTS. At
this point, unix_inflight() can not happen because unix_gc_lock is already
taken. Inflight graph remains unaffected.
Fixes: 1fd05ba5a2f2 ("[AF_UNIX]: Rewrite garbage collector, fixes race.")
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240409201047.1032217-1-mhal@rbox.co
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-09 22:09:39 +02:00
|
|
|
total_refs = file_count(sk->sk_socket->file);
|
2024-06-15 16:02:09 -03:00
|
|
|
|
2024-01-23 09:08:53 -08:00
|
|
|
BUG_ON(!u->inflight);
|
|
|
|
BUG_ON(total_refs < u->inflight);
|
|
|
|
if (total_refs == u->inflight) {
|
2024-06-15 16:02:09 -03:00
|
|
|
list_move_tail(&u->link, &gc_candidates);
|
|
|
|
__set_bit(UNIX_GC_CANDIDATE, &u->gc_flags);
|
|
|
|
__set_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags);
|
af_unix: Fix garbage collector racing against connect()
[ Upstream commit 47d8ac011fe1c9251070e1bd64cb10b48193ec51 ]
Garbage collector does not take into account the risk of embryo getting
enqueued during the garbage collection. If such embryo has a peer that
carries SCM_RIGHTS, two consecutive passes of scan_children() may see a
different set of children. Leading to an incorrectly elevated inflight
count, and then a dangling pointer within the gc_inflight_list.
sockets are AF_UNIX/SOCK_STREAM
S is an unconnected socket
L is a listening in-flight socket bound to addr, not in fdtable
V's fd will be passed via sendmsg(), gets inflight count bumped
connect(S, addr) sendmsg(S, [V]); close(V) __unix_gc()
---------------- ------------------------- -----------
NS = unix_create1()
skb1 = sock_wmalloc(NS)
L = unix_find_other(addr)
unix_state_lock(L)
unix_peer(S) = NS
// V count=1 inflight=0
NS = unix_peer(S)
skb2 = sock_alloc()
skb_queue_tail(NS, skb2[V])
// V became in-flight
// V count=2 inflight=1
close(V)
// V count=1 inflight=1
// GC candidate condition met
for u in gc_inflight_list:
if (total_refs == inflight_refs)
add u to gc_candidates
// gc_candidates={L, V}
for u in gc_candidates:
scan_children(u, dec_inflight)
// embryo (skb1) was not
// reachable from L yet, so V's
// inflight remains unchanged
__skb_queue_tail(L, skb1)
unix_state_unlock(L)
for u in gc_candidates:
if (u.inflight)
scan_children(u, inc_inflight_move_tail)
// V count=1 inflight=2 (!)
If there is a GC-candidate listening socket, lock/unlock its state. This
makes GC wait until the end of any ongoing connect() to that socket. After
flipping the lock, a possibly SCM-laden embryo is already enqueued. And if
there is another embryo coming, it can not possibly carry SCM_RIGHTS. At
this point, unix_inflight() can not happen because unix_gc_lock is already
taken. Inflight graph remains unaffected.
Fixes: 1fd05ba5a2f2 ("[AF_UNIX]: Rewrite garbage collector, fixes race.")
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240409201047.1032217-1-mhal@rbox.co
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-09 22:09:39 +02:00
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN) {
|
af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().
[ Upstream commit 1971d13ffa84a551d29a81fdf5b5ec5be166ac83 ]
syzbot reported a lockdep splat regarding unix_gc_lock and
unix_state_lock().
One is called from recvmsg() for a connected socket, and another
is called from GC for TCP_LISTEN socket.
So, the splat is false-positive.
Let's add a dedicated lock class for the latter to suppress the splat.
Note that this change is not necessary for net-next.git as the issue
is only applied to the old GC impl.
[0]:
WARNING: possible circular locking dependency detected
6.9.0-rc5-syzkaller-00007-g4d2008430ce8 #0 Not tainted
-----------------------------------------------------
kworker/u8:1/11 is trying to acquire lock:
ffff88807cea4e70 (&u->lock){+.+.}-{2:2}, at: spin_lock include/linux/spinlock.h:351 [inline]
ffff88807cea4e70 (&u->lock){+.+.}-{2:2}, at: __unix_gc+0x40e/0xf70 net/unix/garbage.c:302
but task is already holding lock:
ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: spin_lock include/linux/spinlock.h:351 [inline]
ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: __unix_gc+0x117/0xf70 net/unix/garbage.c:261
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (unix_gc_lock){+.+.}-{2:2}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock include/linux/spinlock_api_smp.h:133 [inline]
_raw_spin_lock+0x2e/0x40 kernel/locking/spinlock.c:154
spin_lock include/linux/spinlock.h:351 [inline]
unix_notinflight+0x13d/0x390 net/unix/garbage.c:140
unix_detach_fds net/unix/af_unix.c:1819 [inline]
unix_destruct_scm+0x221/0x350 net/unix/af_unix.c:1876
skb_release_head_state+0x100/0x250 net/core/skbuff.c:1188
skb_release_all net/core/skbuff.c:1200 [inline]
__kfree_skb net/core/skbuff.c:1216 [inline]
kfree_skb_reason+0x16d/0x3b0 net/core/skbuff.c:1252
kfree_skb include/linux/skbuff.h:1262 [inline]
manage_oob net/unix/af_unix.c:2672 [inline]
unix_stream_read_generic+0x1125/0x2700 net/unix/af_unix.c:2749
unix_stream_splice_read+0x239/0x320 net/unix/af_unix.c:2981
do_splice_read fs/splice.c:985 [inline]
splice_file_to_pipe+0x299/0x500 fs/splice.c:1295
do_splice+0xf2d/0x1880 fs/splice.c:1379
__do_splice fs/splice.c:1436 [inline]
__do_sys_splice fs/splice.c:1652 [inline]
__se_sys_splice+0x331/0x4a0 fs/splice.c:1634
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #0 (&u->lock){+.+.}-{2:2}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock include/linux/spinlock_api_smp.h:133 [inline]
_raw_spin_lock+0x2e/0x40 kernel/locking/spinlock.c:154
spin_lock include/linux/spinlock.h:351 [inline]
__unix_gc+0x40e/0xf70 net/unix/garbage.c:302
process_one_work kernel/workqueue.c:3254 [inline]
process_scheduled_works+0xa10/0x17c0 kernel/workqueue.c:3335
worker_thread+0x86d/0xd70 kernel/workqueue.c:3416
kthread+0x2f0/0x390 kernel/kthread.c:388
ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(unix_gc_lock);
lock(&u->lock);
lock(unix_gc_lock);
lock(&u->lock);
*** DEADLOCK ***
3 locks held by kworker/u8:1/11:
#0: ffff888015089148 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work kernel/workqueue.c:3229 [inline]
#0: ffff888015089148 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_scheduled_works+0x8e0/0x17c0 kernel/workqueue.c:3335
#1: ffffc90000107d00 (unix_gc_work){+.+.}-{0:0}, at: process_one_work kernel/workqueue.c:3230 [inline]
#1: ffffc90000107d00 (unix_gc_work){+.+.}-{0:0}, at: process_scheduled_works+0x91b/0x17c0 kernel/workqueue.c:3335
#2: ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: spin_lock include/linux/spinlock.h:351 [inline]
#2: ffffffff8f6ab638 (unix_gc_lock){+.+.}-{2:2}, at: __unix_gc+0x117/0xf70 net/unix/garbage.c:261
stack backtrace:
CPU: 0 PID: 11 Comm: kworker/u8:1 Not tainted 6.9.0-rc5-syzkaller-00007-g4d2008430ce8 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
Workqueue: events_unbound __unix_gc
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114
check_noncircular+0x36a/0x4a0 kernel/locking/lockdep.c:2187
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock include/linux/spinlock_api_smp.h:133 [inline]
_raw_spin_lock+0x2e/0x40 kernel/locking/spinlock.c:154
spin_lock include/linux/spinlock.h:351 [inline]
__unix_gc+0x40e/0xf70 net/unix/garbage.c:302
process_one_work kernel/workqueue.c:3254 [inline]
process_scheduled_works+0xa10/0x17c0 kernel/workqueue.c:3335
worker_thread+0x86d/0xd70 kernel/workqueue.c:3416
kthread+0x2f0/0x390 kernel/kthread.c:388
ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
</TASK>
Fixes: 47d8ac011fe1 ("af_unix: Fix garbage collector racing against connect()")
Reported-and-tested-by: syzbot+fa379358c28cc87cc307@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=fa379358c28cc87cc307
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240424170443.9832-1-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-24 10:04:43 -07:00
|
|
|
unix_state_lock_nested(sk, U_LOCK_GC_LISTENER);
|
af_unix: Fix garbage collector racing against connect()
[ Upstream commit 47d8ac011fe1c9251070e1bd64cb10b48193ec51 ]
Garbage collector does not take into account the risk of embryo getting
enqueued during the garbage collection. If such embryo has a peer that
carries SCM_RIGHTS, two consecutive passes of scan_children() may see a
different set of children. Leading to an incorrectly elevated inflight
count, and then a dangling pointer within the gc_inflight_list.
sockets are AF_UNIX/SOCK_STREAM
S is an unconnected socket
L is a listening in-flight socket bound to addr, not in fdtable
V's fd will be passed via sendmsg(), gets inflight count bumped
connect(S, addr) sendmsg(S, [V]); close(V) __unix_gc()
---------------- ------------------------- -----------
NS = unix_create1()
skb1 = sock_wmalloc(NS)
L = unix_find_other(addr)
unix_state_lock(L)
unix_peer(S) = NS
// V count=1 inflight=0
NS = unix_peer(S)
skb2 = sock_alloc()
skb_queue_tail(NS, skb2[V])
// V became in-flight
// V count=2 inflight=1
close(V)
// V count=1 inflight=1
// GC candidate condition met
for u in gc_inflight_list:
if (total_refs == inflight_refs)
add u to gc_candidates
// gc_candidates={L, V}
for u in gc_candidates:
scan_children(u, dec_inflight)
// embryo (skb1) was not
// reachable from L yet, so V's
// inflight remains unchanged
__skb_queue_tail(L, skb1)
unix_state_unlock(L)
for u in gc_candidates:
if (u.inflight)
scan_children(u, inc_inflight_move_tail)
// V count=1 inflight=2 (!)
If there is a GC-candidate listening socket, lock/unlock its state. This
makes GC wait until the end of any ongoing connect() to that socket. After
flipping the lock, a possibly SCM-laden embryo is already enqueued. And if
there is another embryo coming, it can not possibly carry SCM_RIGHTS. At
this point, unix_inflight() can not happen because unix_gc_lock is already
taken. Inflight graph remains unaffected.
Fixes: 1fd05ba5a2f2 ("[AF_UNIX]: Rewrite garbage collector, fixes race.")
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240409201047.1032217-1-mhal@rbox.co
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-04-09 22:09:39 +02:00
|
|
|
unix_state_unlock(sk);
|
|
|
|
}
|
2024-06-15 16:02:09 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now remove all internal in-flight reference to children of
|
|
|
|
* the candidates.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(u, &gc_candidates, link)
|
|
|
|
scan_children(&u->sk, dec_inflight, NULL);
|
|
|
|
|
|
|
|
/* Restore the references for children of all candidates,
|
|
|
|
* which have remaining references. Do this recursively, so
|
|
|
|
* only those remain, which form cyclic references.
|
|
|
|
*
|
|
|
|
* Use a "cursor" link, to make the list traversal safe, even
|
|
|
|
* though elements might be moved about.
|
|
|
|
*/
|
|
|
|
list_add(&cursor, &gc_candidates);
|
|
|
|
while (cursor.next != &gc_candidates) {
|
|
|
|
u = list_entry(cursor.next, struct unix_sock, link);
|
|
|
|
|
|
|
|
/* Move cursor to after the current position. */
|
|
|
|
list_move(&cursor, &u->link);
|
|
|
|
|
2024-01-23 09:08:53 -08:00
|
|
|
if (u->inflight) {
|
2024-06-15 16:02:09 -03:00
|
|
|
list_move_tail(&u->link, ¬_cycle_list);
|
|
|
|
__clear_bit(UNIX_GC_MAYBE_CYCLE, &u->gc_flags);
|
|
|
|
scan_children(&u->sk, inc_inflight_move_tail, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
list_del(&cursor);
|
|
|
|
|
|
|
|
/* Now gc_candidates contains only garbage. Restore original
|
|
|
|
* inflight counters for these as well, and remove the skbuffs
|
|
|
|
* which are creating the cycle(s).
|
|
|
|
*/
|
|
|
|
skb_queue_head_init(&hitlist);
|
|
|
|
list_for_each_entry(u, &gc_candidates, link)
|
|
|
|
scan_children(&u->sk, inc_inflight, &hitlist);
|
|
|
|
|
|
|
|
/* not_cycle_list contains those sockets which do not make up a
|
|
|
|
* cycle. Restore these to the inflight list.
|
|
|
|
*/
|
|
|
|
while (!list_empty(¬_cycle_list)) {
|
|
|
|
u = list_entry(not_cycle_list.next, struct unix_sock, link);
|
|
|
|
__clear_bit(UNIX_GC_CANDIDATE, &u->gc_flags);
|
|
|
|
list_move_tail(&u->link, &gc_inflight_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock(&unix_gc_lock);
|
|
|
|
|
|
|
|
/* We need io_uring to clean its registered files, ignore all io_uring
|
|
|
|
* originated skbs. It's fine as io_uring doesn't keep references to
|
|
|
|
* other io_uring instances and so killing all other files in the cycle
|
|
|
|
* will put all io_uring references forcing it to go through normal
|
|
|
|
* release.path eventually putting registered files.
|
|
|
|
*/
|
|
|
|
skb_queue_walk_safe(&hitlist, skb, next_skb) {
|
|
|
|
if (skb->scm_io_uring) {
|
|
|
|
__skb_unlink(skb, &hitlist);
|
|
|
|
skb_queue_tail(&skb->sk->sk_receive_queue, skb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Here we are. Hitlist is filled. Die. */
|
|
|
|
__skb_queue_purge(&hitlist);
|
|
|
|
|
|
|
|
spin_lock(&unix_gc_lock);
|
|
|
|
|
|
|
|
/* There could be io_uring registered files, just push them back to
|
|
|
|
* the inflight list
|
|
|
|
*/
|
|
|
|
list_for_each_entry_safe(u, next, &gc_candidates, link)
|
|
|
|
list_move_tail(&u->link, &gc_inflight_list);
|
|
|
|
|
|
|
|
/* All candidates should have been detached by now. */
|
|
|
|
BUG_ON(!list_empty(&gc_candidates));
|
|
|
|
|
|
|
|
/* Paired with READ_ONCE() in wait_for_unix_gc(). */
|
|
|
|
WRITE_ONCE(gc_in_progress, false);
|
|
|
|
|
|
|
|
wake_up(&unix_gc_wait);
|
|
|
|
|
|
|
|
out:
|
|
|
|
spin_unlock(&unix_gc_lock);
|
|
|
|
}
|