leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2014-10-30 12:42:29 +00:00 committed by Greg Kroah-Hartman
parent fb5a88eb9c
commit f025ab9eb7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/comedi_fops.c
View File

@ -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,
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 +