redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'work.__copy_to_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull more __copy_.._user elimination from Al Viro.

* 'work.__copy_to_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  drm_dp_aux_dev: switch to read_iter/write_iter
zero-colors
Linus Torvalds 2017-07-15 11:47:27 -07:00
parent 89cbec71fe 3941dae15e
commit 93ff818597
1 changed files with 46 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
drivers/gpu/drm/drm_dp_aux_dev.c
View File

@ -32,6 +32,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/uio.h>
#include <drm/drm_dp_helper.h> #include <drm/drm_dp_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drmP.h> #include <drm/drmP.h>
@ -140,101 +141,83 @@ static loff_t auxdev_llseek(struct file *file, loff_t offset, int whence)
return fixed_size_llseek(file, offset, whence, AUX_MAX_OFFSET); return fixed_size_llseek(file, offset, whence, AUX_MAX_OFFSET);
} }
static ssize_t auxdev_read(struct file *file, char __user *buf, size_t count, static ssize_t auxdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
loff_t *offset)
{ {
size_t bytes_pending, num_bytes_processed = 0; struct drm_dp_aux_dev *aux_dev = iocb->ki_filp->private_data;
struct drm_dp_aux_dev *aux_dev = file->private_data; loff_t pos = iocb->ki_pos;
ssize_t res = 0; ssize_t res = 0;
if (!atomic_inc_not_zero(&aux_dev->usecount)) if (!atomic_inc_not_zero(&aux_dev->usecount))
return -ENODEV; return -ENODEV;
bytes_pending = min((loff_t)count, AUX_MAX_OFFSET - (*offset)); iov_iter_truncate(to, AUX_MAX_OFFSET - pos);
if (!access_ok(VERIFY_WRITE, buf, bytes_pending)) { while (iov_iter_count(to)) {
res = -EFAULT; uint8_t buf[DP_AUX_MAX_PAYLOAD_BYTES];
goto out; ssize_t todo = min(iov_iter_count(to), sizeof(buf));
}
while (bytes_pending > 0) {
uint8_t localbuf[DP_AUX_MAX_PAYLOAD_BYTES];
ssize_t todo = min_t(size_t, bytes_pending, sizeof(localbuf));
if (signal_pending(current)) { if (signal_pending(current)) {
res = num_bytes_processed ? res = -ERESTARTSYS;
num_bytes_processed : -ERESTARTSYS; break;
goto out;
} }
res = drm_dp_dpcd_read(aux_dev->aux, *offset, localbuf, todo); res = drm_dp_dpcd_read(aux_dev->aux, pos, buf, todo);
if (res <= 0) { if (res <= 0)
res = num_bytes_processed ? num_bytes_processed : res; break;
goto out;
if (copy_to_iter(buf, res, to) != res) {
res = -EFAULT;
break;
} }
if (__copy_to_user(buf + num_bytes_processed, localbuf, res)) {
res = num_bytes_processed ? pos += res;
num_bytes_processed : -EFAULT;
goto out;
}
bytes_pending -= res;
*offset += res;
num_bytes_processed += res;
res = num_bytes_processed;
} }
out: if (pos != iocb->ki_pos)
res = pos - iocb->ki_pos;
iocb->ki_pos = pos;
atomic_dec(&aux_dev->usecount); atomic_dec(&aux_dev->usecount);
wake_up_atomic_t(&aux_dev->usecount); wake_up_atomic_t(&aux_dev->usecount);
return res; return res;
} }
static ssize_t auxdev_write(struct file *file, const char __user *buf, static ssize_t auxdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
size_t count, loff_t *offset)
{ {
size_t bytes_pending, num_bytes_processed = 0; struct drm_dp_aux_dev *aux_dev = iocb->ki_filp->private_data;
struct drm_dp_aux_dev *aux_dev = file->private_data; loff_t pos = iocb->ki_pos;
ssize_t res = 0; ssize_t res = 0;
if (!atomic_inc_not_zero(&aux_dev->usecount)) if (!atomic_inc_not_zero(&aux_dev->usecount))
return -ENODEV; return -ENODEV;
bytes_pending = min((loff_t)count, AUX_MAX_OFFSET - *offset); iov_iter_truncate(from, AUX_MAX_OFFSET - pos);
if (!access_ok(VERIFY_READ, buf, bytes_pending)) { while (iov_iter_count(from)) {
res = -EFAULT; uint8_t buf[DP_AUX_MAX_PAYLOAD_BYTES];
goto out; ssize_t todo = min(iov_iter_count(from), sizeof(buf));
}
while (bytes_pending > 0) {
uint8_t localbuf[DP_AUX_MAX_PAYLOAD_BYTES];
ssize_t todo = min_t(size_t, bytes_pending, sizeof(localbuf));
if (signal_pending(current)) { if (signal_pending(current)) {
res = num_bytes_processed ? res = -ERESTARTSYS;
num_bytes_processed : -ERESTARTSYS; break;
goto out;
} }
if (__copy_from_user(localbuf, if (!copy_from_iter_full(buf, todo, from)) {
buf + num_bytes_processed, todo)) { res = -EFAULT;
res = num_bytes_processed ? break;
num_bytes_processed : -EFAULT;
goto out;
} }
res = drm_dp_dpcd_write(aux_dev->aux, *offset, localbuf, todo); res = drm_dp_dpcd_write(aux_dev->aux, pos, buf, todo);
if (res <= 0) { if (res <= 0)
res = num_bytes_processed ? num_bytes_processed : res; break;
goto out;
} pos += res;
bytes_pending -= res;
*offset += res;
num_bytes_processed += res;
res = num_bytes_processed;
} }
out: if (pos != iocb->ki_pos)
res = pos - iocb->ki_pos;
iocb->ki_pos = pos;
atomic_dec(&aux_dev->usecount); atomic_dec(&aux_dev->usecount);
wake_up_atomic_t(&aux_dev->usecount); wake_up_atomic_t(&aux_dev->usecount);
return res; return res;
@ -251,8 +234,8 @@ static int auxdev_release(struct inode *inode, struct file *file)
static const struct file_operations auxdev_fops = { static const struct file_operations auxdev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = auxdev_llseek, .llseek = auxdev_llseek,
.read = auxdev_read, .read_iter = auxdev_read_iter,
.write = auxdev_write, .write_iter = auxdev_write_iter,
.open = auxdev_open, .open = auxdev_open,
.release = auxdev_release, .release = auxdev_release,
}; };