Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails
authorThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 13 Apr 2021 16:21:03 +0000 (13:21 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Jun 2021 06:36:18 +0000 (08:36 +0200)
commit6f6ac2a7959b1864886d07fcf3b9cec587dfe635
treea82fa3af8550488e37e98d0f4676505638b568e0
parent9e6b8c1ff9d997e1fa16cbd2d60739adf6dc1bbc
Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails

commit 8da3a0b87f4f1c3a3bbc4bfb78cf68476e97d183 upstream.

When cmtp_attach_device fails, cmtp_add_connection returns the error value
which leads to the caller to doing fput through sockfd_put. But
cmtp_session kthread, which is stopped in this path will also call fput,
leading to a potential refcount underflow or a use-after-free.

Add a refcount before we signal the kthread to stop. The kthread will try
to grab the cmtp_session_sem mutex before doing the fput, which is held
when get_file is called, so there should be no races there.

Reported-by: Ryota Shiga
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bluetooth/cmtp/core.c