Matthias Kaehlcke c4f5627f7e Bluetooth: Fix locking in bt_accept_enqueue() for BH context ... With commit e163376220 ("Bluetooth: Handle bt_accept_enqueue() socket atomically") lock_sock[_nested]() is used to acquire the socket lock before manipulating the socket. lock_sock[_nested]() may block, which is problematic since bt_accept_enqueue() can be called in bottom half context (e.g. from rfcomm_connect_ind()): [<ffffff80080d81ec>] __might_sleep+0x4c/0x80 [<ffffff800876c7b0>] lock_sock_nested+0x24/0x58 [<ffffff8000d7c27c>] bt_accept_enqueue+0x48/0xd4 [bluetooth] [<ffffff8000e67d8c>] rfcomm_connect_ind+0x190/0x218 [rfcomm] Add a parameter to bt_accept_enqueue() to indicate whether the function is called from BH context, and acquire the socket lock with bh_lock_sock_nested() if that's the case. Also adapt all callers of bt_accept_enqueue() to pass the new parameter: - l2cap_sock_new_connection_cb() - uses lock_sock() to lock the parent socket => process context - rfcomm_connect_ind() - acquires the parent socket lock with bh_lock_sock() => BH context - __sco_chan_add() - called from sco_chan_add(), which is called from sco_connect(). parent is NULL, hence bt_accept_enqueue() isn't called in this code path and we can ignore it - also called from sco_conn_ready(). uses bh_lock_sock() to acquire the parent lock => BH context Fixes: e163376220 ("Bluetooth: Handle bt_accept_enqueue() socket atomically") Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org		2019-01-22 09:51:20 +01:00
..
acpi
asm-generic	Merge branch 'akpm' (patches from Andrew)	2019-01-05 09:16:18 -08:00
clocksource
crypto
drm	Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes	2019-01-11 10:26:21 +01:00
dt-bindings	dt-bindings: reset: meson-axg: fix SPDX license id	2019-01-16 12:50:27 -06:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-01-21 14:41:32 -08:00
math-emu
media
memory
misc
net	Bluetooth: Fix locking in bt_accept_enqueue() for BH context	2019-01-22 09:51:20 +01:00
pcmcia
ras
rdma
scsi	4.21 merge window pull request	2018-12-28 14:57:10 -08:00
soc	ARM: SoC driver updates	2018-12-31 17:32:35 -08:00
sound
target
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-01-21 14:41:32 -08:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-01-21 14:41:32 -08:00
video
xen