UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Bluetooth] Check that device is in rfcomm_dev_list before deleting 

If RFCOMM_RELEASE_ONHUP flag is on and rfcomm_release_dev is called
before connection is closed, rfcomm_dev is deleted twice from the
rfcomm_dev_list and refcount is messed up. This patch adds a check
before deleting device that the device actually is listed.

Signed-off-by: Ville Tervo <ville.tervo@nokia.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Marcel Holtmann 2007-05-05 00:36:10 +02:00
parent 48db9ca4f2
commit 77f2a45fa1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/bluetooth/rfcomm/tty.c
View File

@ -517,9 +517,10 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)
if (dlc->state == BT_CLOSED) { if (dlc->state == BT_CLOSED) {
if (!dev->tty) { if (!dev->tty) {
if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) { if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) {
rfcomm_dev_hold(dev); if (rfcomm_dev_get(dev->id) == NULL)
rfcomm_dev_del(dev); return;
rfcomm_dev_del(dev);
/* We have to drop DLC lock here, otherwise /* We have to drop DLC lock here, otherwise
rfcomm_dev_put() will dead lock if it's rfcomm_dev_put() will dead lock if it's
the last reference. */ the last reference. */
@ -974,8 +975,12 @@ static void rfcomm_tty_hangup(struct tty_struct *tty)
rfcomm_tty_flush_buffer(tty); rfcomm_tty_flush_buffer(tty);
if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) {
if (rfcomm_dev_get(dev->id) == NULL)
return;
rfcomm_dev_del(dev); rfcomm_dev_del(dev);
rfcomm_dev_put(dev);
}
} }
static int rfcomm_tty_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *unused) static int rfcomm_tty_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *unused)