Commit 40d0e80e authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: return error on "write" if no command set up

The "write" file operation handler, `comedi_write()` returns an error
for pretty much any condition that prevents a "write" going ahead.  One
of the conditions that prevents a "write" going ahead is that no
asynchronous command has been set up, but that currently results in a
return value of 0 (unless COMEDI instructions are being processed or an
asynchronous command has been set up by a different file object).
Change it to return `-EINVAL` in this case.
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 35a7475d
...@@ -2331,9 +2331,12 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -2331,9 +2331,12 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
} }
async = s->async; async = s->async;
if (!nbytes)
if (!s->busy || !nbytes) goto out;
if (!s->busy) {
retval = -EINVAL;
goto out; goto out;
}
if (s->busy != file) { if (s->busy != file) {
retval = -EACCES; retval = -EACCES;
goto out; goto out;
...@@ -2373,8 +2376,10 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -2373,8 +2376,10 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
break; break;
} }
if (!s->busy) if (!s->busy) {
retval = -EINVAL;
break; break;
}
if (s->busy != file) { if (s->busy != file) {
retval = -EACCES; retval = -EACCES;
break; break;
......
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