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

staging: comedi: don't allow read() on async command set up for "write"

If a Comedi asynchronous command has been set up for data transfer in
the "write" direction on the current "read" subdevice (for those
subdevices that support both directions), don't allow the "read" file
operation as that would mess with the data in the comedi data buffer
that is read by the low-level comedi hardware driver.
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 fb5a88eb
...@@ -2210,6 +2210,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, ...@@ -2210,6 +2210,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
retval = -EACCES; retval = -EACCES;
goto out; goto out;
} }
if (async->cmd.flags & CMDF_WRITE) {
retval = -EINVAL;
goto out;
}
add_wait_queue(&async->wait_head, &wait); add_wait_queue(&async->wait_head, &wait);
while (nbytes > 0 && !retval) { while (nbytes > 0 && !retval) {
...@@ -2249,6 +2253,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, ...@@ -2249,6 +2253,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
retval = -EACCES; retval = -EACCES;
break; break;
} }
if (async->cmd.flags & CMDF_WRITE) {
retval = -EINVAL;
break;
}
continue; continue;
} }
m = copy_to_user(buf, async->prealloc_buf + m = copy_to_user(buf, async->prealloc_buf +
......
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