OSDN Git Service

iio: core: return -EINVAL when no ioctl handler has been run
authorAlexandru Ardelean <alexandru.ardelean@analog.com>
Tue, 17 Nov 2020 09:51:54 +0000 (11:51 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 21 Nov 2020 16:48:23 +0000 (16:48 +0000)
It seems that when this was tested the happy case was more tested. A few of
the userspace apps rely on this returning negative error codes in case an
ioctl() is not available.

When running multiple ioctl() handlers or when calling an ioctl() that
doesn't exist, IIO_IOCTL_UNHANDLED is returned. In that case -EINVAL should
be returned.

Fixes: 8dedcc3eee3a ("iio: core: centralize ioctl() calls to the main chardev")
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201117095154.7189-1-alexandru.ardelean@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/industrialio-core.c

index 89f9af1..7cae46f 100644 (file)
@@ -1743,6 +1743,9 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                        break;
        }
 
+       if (ret == IIO_IOCTL_UNHANDLED)
+               ret = -EINVAL;
+
 out_unlock:
        mutex_unlock(&indio_dev->info_exist_lock);