From: Jonathan Cameron <jic23@kernel.org>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH v2 2/5] iio: Return -ENODEV for file operations if the device has been unregistered
Date: Sat, 12 Oct 2013 12:04:41 +0100 [thread overview]
Message-ID: <52592CC9.4010504@kernel.org> (raw)
In-Reply-To: <1380884822-17035-2-git-send-email-lars@metafoo.de>
On 10/04/13 12:06, Lars-Peter Clausen wrote:
> If the IIO device has been unregistered return -ENODEV for any further file
> operations like read() and ioctl(). This avoids userspace being able to grab new
> references to the device.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git
Thanks
> ---
> No changes since v1
> ---
> drivers/iio/industrialio-buffer.c | 6 ++++++
> drivers/iio/industrialio-core.c | 3 +++
> drivers/iio/industrialio-event.c | 6 ++++++
> 3 files changed, 15 insertions(+)
>
> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> index 36c39dc..6c7a9c5 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -48,6 +48,9 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
> struct iio_dev *indio_dev = filp->private_data;
> struct iio_buffer *rb = indio_dev->buffer;
>
> + if (!indio_dev->info)
> + return -ENODEV;
> +
> if (!rb || !rb->access->read_first_n)
> return -EINVAL;
> return rb->access->read_first_n(rb, n, buf);
> @@ -62,6 +65,9 @@ unsigned int iio_buffer_poll(struct file *filp,
> struct iio_dev *indio_dev = filp->private_data;
> struct iio_buffer *rb = indio_dev->buffer;
>
> + if (!indio_dev->info)
> + return -ENODEV;
> +
> poll_wait(filp, &rb->pollq, wait);
> if (rb->stufftoread)
> return POLLIN | POLLRDNORM;
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 0dfaf9e..c9c6558 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -1041,6 +1041,9 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> int __user *ip = (int __user *)arg;
> int fd;
>
> + if (!indio_dev->info)
> + return -ENODEV;
> +
> if (cmd == IIO_GET_EVENT_FD_IOCTL) {
> fd = iio_event_getfd(indio_dev);
> if (copy_to_user(ip, &fd, sizeof(fd)))
> diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
> index 36f0c8e..837d450 100644
> --- a/drivers/iio/industrialio-event.c
> +++ b/drivers/iio/industrialio-event.c
> @@ -76,6 +76,9 @@ static unsigned int iio_event_poll(struct file *filep,
> struct iio_event_interface *ev_int = indio_dev->event_interface;
> unsigned int events = 0;
>
> + if (!indio_dev->info)
> + return -ENODEV;
> +
> poll_wait(filep, &ev_int->wait, wait);
>
> spin_lock_irq(&ev_int->wait.lock);
> @@ -96,6 +99,9 @@ static ssize_t iio_event_chrdev_read(struct file *filep,
> unsigned int copied;
> int ret;
>
> + if (!indio_dev->info)
> + return -ENODEV;
> +
> if (count < sizeof(struct iio_event_data))
> return -EINVAL;
>
>
next prev parent reply other threads:[~2013-10-12 10:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 11:06 [PATCH v2 1/5] iio: Add reference counting for buffers Lars-Peter Clausen
2013-10-04 11:06 ` [PATCH v2 2/5] iio: Return -ENODEV for file operations if the device has been unregistered Lars-Peter Clausen
2013-10-12 11:04 ` Jonathan Cameron [this message]
2013-10-04 11:07 ` [PATCH v2 3/5] iio: Wakeup poll and blocking reads when the device is unregistered Lars-Peter Clausen
2013-10-12 11:06 ` Jonathan Cameron
2013-10-04 11:07 ` [PATCH v2 4/5] iio:buffer: Add proper locking for iio_update_buffers() Lars-Peter Clausen
2013-10-12 11:07 ` Jonathan Cameron
2013-10-04 11:07 ` [PATCH v2 5/5] iio:buffer: Ignore noop requests " Lars-Peter Clausen
2013-10-12 11:10 ` Jonathan Cameron
2013-10-12 10:19 ` Lars-Peter Clausen
2013-10-12 12:06 ` Jonathan Cameron
2013-10-12 12:06 ` Jonathan Cameron
2013-10-12 11:00 ` [PATCH v2 1/5] iio: Add reference counting for buffers Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52592CC9.4010504@kernel.org \
--to=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.