Commit ad25f5cb authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

rxrpc: Fix locking issue 



There's a locking issue with the per-netns list of calls in rxrpc.  The
pieces of code that add and remove a call from the list use write_lock()
and the calls procfile uses read_lock() to access it.  However, the timer
callback function may trigger a removal by trying to queue a call for
processing and finding that it's already queued - at which point it has a
spare refcount that it has to do something with.  Unfortunately, if it puts
the call and this reduces the refcount to 0, the call will be removed from
the list.  Unfortunately, since the _bh variants of the locking functions
aren't used, this can deadlock.

================================
WARNING: inconsistent lock state
5.18.0-rc3-build4+ #10 Not tainted
--------------------------------
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
ksoftirqd/2/25 [HC0[0]:SC1[1]:HE1:SE0] takes:
ffff888107ac4038 (&rxnet->call_lock){+.?.}-{2:2}, at: rxrpc_put_call+0x103/0x14b
{SOFTIRQ-ON-W} state was registered at:
...
 Possible unsafe locking scenario:

       CPU0
       ----
  lock(&rxnet->call_lock);
  <Interrupt>
    lock(&rxnet->call_lock);

 *** DEADLOCK ***

1 lock held by ksoftirqd/2/25:
 #0: ffff8881008ffdb0 ((&call->timer)){+.-.}-{0:0}, at: call_timer_fn+0x5/0x23d

Changes
=======
ver #2)
 - Changed to using list_next_rcu() rather than rcu_dereference() directly.

Fixes: 17926a79 ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0575429

fs/seq_file.c

+32 −0
Original line number Diff line number Diff line
@@ -931,6 +931,38 @@ struct list_head *seq_list_next(void *v, struct list_head *head, loff_t *ppos) 
}

EXPORT_SYMBOL(seq_list_next);



struct list_head *seq_list_start_rcu(struct list_head *head, loff_t pos)

{

	struct list_head *lh;



	list_for_each_rcu(lh, head)

		if (pos-- == 0)

			return lh;



	return NULL;

}

EXPORT_SYMBOL(seq_list_start_rcu);



struct list_head *seq_list_start_head_rcu(struct list_head *head, loff_t pos)

{

	if (!pos)

		return head;



	return seq_list_start_rcu(head, pos - 1);

}

EXPORT_SYMBOL(seq_list_start_head_rcu);



struct list_head *seq_list_next_rcu(void *v, struct list_head *head,

				    loff_t *ppos)

{

	struct list_head *lh;



	lh = list_next_rcu((struct list_head *)v);

	++*ppos;

	return lh == head ? NULL : lh;

}

EXPORT_SYMBOL(seq_list_next_rcu);



/**

 * seq_hlist_start - start an iteration of a hlist

 * @head: the head of the hlist

include/linux/list.h

+10 −0
Original line number Diff line number Diff line
@@ -605,6 +605,16 @@ static inline void list_splice_tail_init(struct list_head *list, 
#define list_for_each(pos, head) \

	for (pos = (head)->next; !list_is_head(pos, (head)); pos = pos->next)



/**

 * list_for_each_rcu - Iterate over a list in an RCU-safe fashion

 * @pos:	the &struct list_head to use as a loop cursor.

 * @head:	the head for your list.

 */

#define list_for_each_rcu(pos, head)		  \

	for (pos = rcu_dereference((head)->next); \

	     !list_is_head(pos, (head)); \

	     pos = rcu_dereference(pos->next))



/**

 * list_for_each_continue - continue iteration over a list

 * @pos:	the &struct list_head to use as a loop cursor.

include/linux/seq_file.h

+4 −0
Original line number Diff line number Diff line
@@ -277,6 +277,10 @@ extern struct list_head *seq_list_start_head(struct list_head *head, 
extern struct list_head *seq_list_next(void *v, struct list_head *head,

		loff_t *ppos);



extern struct list_head *seq_list_start_rcu(struct list_head *head, loff_t pos);

extern struct list_head *seq_list_start_head_rcu(struct list_head *head, loff_t pos);

extern struct list_head *seq_list_next_rcu(void *v, struct list_head *head, loff_t *ppos);



/*

 * Helpers for iteration over hlist_head-s in seq_files

 */

net/rxrpc/ar-internal.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct rxrpc_net { 
	struct proc_dir_entry	*proc_net;	/* Subdir in /proc/net */

	u32			epoch;		/* Local epoch for detecting local-end reset */

	struct list_head	calls;		/* List of calls active in this namespace */

	rwlock_t		call_lock;	/* Lock for ->calls */

	spinlock_t		call_lock;	/* Lock for ->calls */

	atomic_t		nr_calls;	/* Count of allocated calls */



	atomic_t		nr_conns;

net/rxrpc/call_accept.c

+3 −3
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ static int rxrpc_service_prealloc_one(struct rxrpc_sock *rx, 
	write_unlock(&rx->call_lock);



	rxnet = call->rxnet;

	write_lock(&rxnet->call_lock);

	list_add_tail(&call->link, &rxnet->calls);

	write_unlock(&rxnet->call_lock);

	spin_lock_bh(&rxnet->call_lock);

	list_add_tail_rcu(&call->link, &rxnet->calls);

	spin_unlock_bh(&rxnet->call_lock);



	b->call_backlog[call_head] = call;

	smp_store_release(&b->call_backlog_head, (call_head + 1) & (size - 1));