Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db7589f authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Use wait_event_interruptible for virtual driver 



The virtual driver still uses a home grown way of waiting for events and
so just replace it with wait_event_interruptible. And while at it remove
the useless access_ok() checks.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent ac28494c

drivers/bluetooth/hci_vhci.c

+15 −28
Original line number Diff line number Diff line
@@ -179,41 +179,31 @@ static inline ssize_t vhci_put_user(struct vhci_data *data, 
static ssize_t vhci_read(struct file *file,

				char __user *buf, size_t count, loff_t *pos)

{

	DECLARE_WAITQUEUE(wait, current);

	struct vhci_data *data = file->private_data;

	struct sk_buff *skb;

	ssize_t ret = 0;



	add_wait_queue(&data->read_wait, &wait);

	while (count) {

		set_current_state(TASK_INTERRUPTIBLE);



		skb = skb_dequeue(&data->readq);

		if (!skb) {

			if (file->f_flags & O_NONBLOCK) {

				ret = -EAGAIN;

		if (skb) {

			ret = vhci_put_user(data, skb, buf, count);

			if (ret < 0)

				skb_queue_head(&data->readq, skb);

			else

				kfree_skb(skb);

			break;

		}



			if (signal_pending(current)) {

				ret = -ERESTARTSYS;

		if (file->f_flags & O_NONBLOCK) {

			ret = -EAGAIN;

			break;

		}



			schedule();

			continue;

		}



		if (access_ok(VERIFY_WRITE, buf, count))

			ret = vhci_put_user(data, skb, buf, count);

		else

			ret = -EFAULT;



		kfree_skb(skb);

		ret = wait_event_interruptible(data->read_wait,

					!skb_queue_empty(&data->readq));

		if (ret < 0)

			break;

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(&data->read_wait, &wait);



	return ret;

}
@@ -223,9 +213,6 @@ static ssize_t vhci_write(struct file *file, 
{

	struct vhci_data *data = file->private_data;



	if (!access_ok(VERIFY_READ, buf, count))

		return -EFAULT;



	return vhci_get_user(data, buf, count);

}