diff options
| author | Hamish Martin <hamish.martin@alliedtelesis.co.nz> | 2019-02-13 16:29:24 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-15 08:09:13 +0100 |
| commit | cd4fe6339ccd9638da1304160abe60b84115dee5 (patch) | |
| tree | a4a9622a65b94ab671efd0e0098bccd7bd253f77 /drivers/uio | |
| parent | 943f5f2a7d70f117a730dceb58131957f3c337c8 (diff) | |
| download | linux-stable-cd4fe6339ccd9638da1304160abe60b84115dee5.tar.gz linux-stable-cd4fe6339ccd9638da1304160abe60b84115dee5.tar.bz2 linux-stable-cd4fe6339ccd9638da1304160abe60b84115dee5.zip | |
uio: Reduce return paths from uio_write()
commit 81daa406c2cc97d85eef9409400404efc2a3f756 upstream.
Drive all return paths for uio_write() through a single block at the
end of the function.
Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
| -rw-r--r-- | drivers/uio/uio.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 654579bc1e54..10f249628e79 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -570,20 +570,29 @@ static ssize_t uio_write(struct file *filep, const char __user *buf, ssize_t retval; s32 irq_on; - if (!idev->info->irq) - return -EIO; + if (!idev->info->irq) { + retval = -EIO; + goto out; + } - if (count != sizeof(s32)) - return -EINVAL; + if (count != sizeof(s32)) { + retval = -EINVAL; + goto out; + } - if (!idev->info->irqcontrol) - return -ENOSYS; + if (!idev->info->irqcontrol) { + retval = -ENOSYS; + goto out; + } - if (copy_from_user(&irq_on, buf, count)) - return -EFAULT; + if (copy_from_user(&irq_on, buf, count)) { + retval = -EFAULT; + goto out; + } retval = idev->info->irqcontrol(idev->info, irq_on); +out: return retval ? retval : sizeof(s32); } |