* [PATCH] iio: percolate error if event fd fails
@ 2015-08-11 9:56 Linus Walleij
2015-08-11 10:52 ` Daniel Baluta
0 siblings, 1 reply; 4+ messages in thread
From: Linus Walleij @ 2015-08-11 9:56 UTC (permalink / raw)
To: Jonathan Cameron, linux-iio; +Cc: Linus Walleij
This makes the error from iio_event_getfd() percolate up
to userspace properly so we can know for sure there is no
events on this device (-ENODEV returned). Before this patch
we would bail out looking for the unsupported evens on the
erroneous (negative) file descriptor.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/iio/industrialio-core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 3524b0de8721..9492aa443a26 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1130,6 +1130,8 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (cmd == IIO_GET_EVENT_FD_IOCTL) {
fd = iio_event_getfd(indio_dev);
+ if (fd < 0)
+ return fd;
if (copy_to_user(ip, &fd, sizeof(fd)))
return -EFAULT;
return 0;
--
2.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] iio: percolate error if event fd fails
2015-08-11 9:56 [PATCH] iio: percolate error if event fd fails Linus Walleij
@ 2015-08-11 10:52 ` Daniel Baluta
2015-08-15 15:22 ` Jonathan Cameron
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Baluta @ 2015-08-11 10:52 UTC (permalink / raw)
To: Linus Walleij; +Cc: Jonathan Cameron, linux-iio
On Tue, Aug 11, 2015 at 12:56 PM, Linus Walleij
<linus.walleij@linaro.org> wrote:
> This makes the error from iio_event_getfd() percolate up
> to userspace properly so we can know for sure there is no
> events on this device (-ENODEV returned). Before this patch
> we would bail out looking for the unsupported evens on the
> erroneous (negative) file descriptor.
Good catch. s/evens/events
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
> ---
> drivers/iio/industrialio-core.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 3524b0de8721..9492aa443a26 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -1130,6 +1130,8 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>
> if (cmd == IIO_GET_EVENT_FD_IOCTL) {
> fd = iio_event_getfd(indio_dev);
> + if (fd < 0)
> + return fd;
> if (copy_to_user(ip, &fd, sizeof(fd)))
> return -EFAULT;
> return 0;
> --
> 2.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iio: percolate error if event fd fails
2015-08-11 10:52 ` Daniel Baluta
@ 2015-08-15 15:22 ` Jonathan Cameron
2015-08-17 8:22 ` Linus Walleij
0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Cameron @ 2015-08-15 15:22 UTC (permalink / raw)
To: Daniel Baluta, Linus Walleij; +Cc: linux-iio
On 11/08/15 11:52, Daniel Baluta wrote:
> On Tue, Aug 11, 2015 at 12:56 PM, Linus Walleij
> <linus.walleij@linaro.org> wrote:
>> This makes the error from iio_event_getfd() percolate up
>> to userspace properly so we can know for sure there is no
>> events on this device (-ENODEV returned). Before this patch
>> we would bail out looking for the unsupported evens on the
>> erroneous (negative) file descriptor.
>
> Good catch. s/evens/events
>
>>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Applied to the togreg branch of iio.git. Initially pushed
out as testing. I'm not sending this as a fix as the error
that resulted was downright missleading, but unlikely to
have caused any nasty crashes or similar.
If you think if should be going in faster/ for stable then
let me know.
Jonathan
>
>> ---
>> drivers/iio/industrialio-core.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
>> index 3524b0de8721..9492aa443a26 100644
>> --- a/drivers/iio/industrialio-core.c
>> +++ b/drivers/iio/industrialio-core.c
>> @@ -1130,6 +1130,8 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>>
>> if (cmd == IIO_GET_EVENT_FD_IOCTL) {
>> fd = iio_event_getfd(indio_dev);
>> + if (fd < 0)
>> + return fd;
>> if (copy_to_user(ip, &fd, sizeof(fd)))
>> return -EFAULT;
>> return 0;
>> --
>> 2.4.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iio: percolate error if event fd fails
2015-08-15 15:22 ` Jonathan Cameron
@ 2015-08-17 8:22 ` Linus Walleij
0 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2015-08-17 8:22 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Daniel Baluta, linux-iio
On Sat, Aug 15, 2015 at 5:22 PM, Jonathan Cameron <jic23@kernel.org> wrote:
> Applied to the togreg branch of iio.git. Initially pushed
> out as testing. I'm not sending this as a fix as the error
> that resulted was downright missleading, but unlikely to
> have caused any nasty crashes or similar.
>
> If you think if should be going in faster/ for stable then
> let me know.
Nah. No regression, just general improvenent.
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-17 8:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-11 9:56 [PATCH] iio: percolate error if event fd fails Linus Walleij
2015-08-11 10:52 ` Daniel Baluta
2015-08-15 15:22 ` Jonathan Cameron
2015-08-17 8:22 ` Linus Walleij
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.