Commit 28a60c45 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: check for more errors for zero-length write

If the "write" file operation handler, `comedi_write()` is passed 0 for
the amount to write, some error conditions are currently skipped and the
function just returns 0.  Change it to check those error conditions and
return an error value if appropriate.  The trickiest case is the check
for when the previously set up asynchronous command has terminated with
an error.  In that case, `-EPIPE` is returned (as it is for a write of
non-zero length) and the subdevice gets marked as non-busy.

A zero-length write that returns 0 has no other effects, in particular,
it does not cause the subdevice to be marked as non-busy.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3318c7ad
...@@ -2331,8 +2331,6 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -2331,8 +2331,6 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
} }
async = s->async; async = s->async;
if (!nbytes)
goto out;
if (s->busy != file || !(async->cmd.flags & CMDF_WRITE)) { if (s->busy != file || !(async->cmd.flags & CMDF_WRITE)) {
retval = -EINVAL; retval = -EINVAL;
goto out; goto out;
...@@ -2349,9 +2347,12 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -2349,9 +2347,12 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
if (!comedi_is_runflags_running(runflags)) { if (!comedi_is_runflags_running(runflags)) {
if (comedi_is_runflags_in_error(runflags)) if (comedi_is_runflags_in_error(runflags))
retval = -EPIPE; retval = -EPIPE;
become_nonbusy = true; if (retval || nbytes)
become_nonbusy = true;
break; break;
} }
if (nbytes == 0)
break;
/* Allocate all free buffer space. */ /* Allocate all free buffer space. */
comedi_buf_write_alloc(s, async->prealloc_bufsz); comedi_buf_write_alloc(s, async->prealloc_bufsz);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment