--- x/drivers/bluetooth/hci_vhci.c +++ y/drivers/bluetooth/hci_vhci.c @@ -320,6 +320,7 @@ static inline void force_devcd_timeout(s #endif } +static DEFINE_MUTEX(vhci_release_lock); static ssize_t force_devcd_write(struct file *file, const char __user *user_buf, size_t count, loff_t *ppos) { @@ -343,6 +344,17 @@ static ssize_t force_devcd_write(struct return -ENOMEM; skb_put_data(skb, &dump_data.data, data_size); + if (!mutex_trylock(&vhci_release_lock)) { +out: + kfree_skb(skb); + return -EBUSY; + } + data = file->private_data; + if (!data) { + mutex_unlock(&vhci_release_lock); + goto out; + } + hdev = data->hdev; hci_devcd_register(hdev, vhci_coredump, vhci_coredump_hdr, NULL); /* Force the devcoredump timeout */ @@ -352,6 +364,7 @@ static ssize_t force_devcd_write(struct ret = hci_devcd_init(hdev, skb->len); if (ret) { BT_ERR("Failed to generate devcoredump"); + mutex_unlock(&vhci_release_lock); kfree_skb(skb); return ret; } @@ -369,9 +382,11 @@ static ssize_t force_devcd_write(struct /* Do nothing */ break; default: + mutex_unlock(&vhci_release_lock); return -EINVAL; } + mutex_unlock(&vhci_release_lock); return count; } @@ -656,6 +671,7 @@ static int vhci_release(struct inode *in struct vhci_data *data = file->private_data; struct hci_dev *hdev; + mutex_lock(&vhci_release_lock); cancel_delayed_work_sync(&data->open_timeout); flush_work(&data->suspend_work); @@ -669,6 +685,7 @@ static int vhci_release(struct inode *in skb_queue_purge(&data->readq); file->private_data = NULL; kfree(data); + mutex_unlock(&vhci_release_lock); return 0; }