xdp: fix potential deadlock on socket mutex
authorIlya Maximets <i.maximets@samsung.com>
Mon, 8 Jul 2019 11:03:44 +0000 (14:03 +0300)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 12 Jul 2019 13:02:21 +0000 (15:02 +0200)
commit5464c3a0e9a037b63d5229cdea08dddc01a98aac
treeb7d54d9aef6b6e95b7db08ad745aa5345b4a856f
parent675716400da6f15b9d3db04ef74ee74ca9a00af3
xdp: fix potential deadlock on socket mutex

There are 2 call chains:

  a) xsk_bind --> xdp_umem_assign_dev
  b) unregister_netdevice_queue --> xsk_notifier

with the following locking order:

  a) xs->mutex --> rtnl_lock
  b) rtnl_lock --> xdp.lock --> xs->mutex

Different order of taking 'xs->mutex' and 'rtnl_lock' could produce a
deadlock here. Fix that by moving the 'rtnl_lock' before 'xs->lock' in
the bind call chain (a).

Reported-by: syzbot+bf64ec93de836d7f4c2c@syzkaller.appspotmail.com
Fixes: 455302d1c9ae ("xdp: fix hang while unregistering device bound to xdp socket")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
net/xdp/xdp_umem.c
net/xdp/xsk.c