mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
net/rds: ib: don't enable IRQs in rds_ib_conn_free()
__rds_conn_create() calls trans->conn_free() with rds_conn_lock held
and IRQs disabled when it loses the race to insert a connection.
rds_ib_conn_free() takes the device list lock with spin_lock_irq() and
releases it with spin_unlock_irq(), so IRQs are turned on while
rds_conn_lock is still held:
raw_local_irq_restore() called with IRQs enabled
WARNING: kernel/locking/irqflag-debug.c:10 at warn_bogus_irq_restore+0xc/0x20
_raw_spin_unlock_irqrestore+0x67/0x80
__rds_conn_create+0x1de5/0x2290
rds_conn_create_outgoing+0x43/0x60
rds_sendmsg+0xfca/0x20e0
__sys_sendto+0x408/0x5a0
It needs an RDS socket bound to an address on an RDMA device (e.g. rxe)
and two concurrent sendto() calls to the same new destination.
The TCP and loopback ->conn_free() callbacks already use irqsave, so
do the same here.
Fixes: 745cbccac3 ("RDS: Rewrite connection cleanup, fixing oops on rmmod")
Reported-by: syzbot+c3741bb338b5c6d6a4aa@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=c3741bb338b5c6d6a4aa
Cc: stable@vger.kernel.org
Signed-off-by: Nguyen Ngoc Thang <ngocthang2710.1999@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
5d1b850ea3
commit
f6fa1d60ec
|
|
@ -1284,6 +1284,7 @@ void rds_ib_conn_free(void *arg)
|
|||
{
|
||||
struct rds_ib_connection *ic = arg;
|
||||
spinlock_t *lock_ptr;
|
||||
unsigned long flags;
|
||||
|
||||
rdsdebug("ic %p\n", ic);
|
||||
|
||||
|
|
@ -1294,9 +1295,10 @@ void rds_ib_conn_free(void *arg)
|
|||
*/
|
||||
lock_ptr = ic->rds_ibdev ? &ic->rds_ibdev->spinlock : &ib_nodev_conns_lock;
|
||||
|
||||
spin_lock_irq(lock_ptr);
|
||||
/* May be called with IRQs already disabled (see __rds_conn_create()) */
|
||||
spin_lock_irqsave(lock_ptr, flags);
|
||||
list_del(&ic->ib_node);
|
||||
spin_unlock_irq(lock_ptr);
|
||||
spin_unlock_irqrestore(lock_ptr, flags);
|
||||
|
||||
rds_ib_recv_free_caches(ic);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user