diff options
| author | Alexander Usyskin <alexander.usyskin@intel.com> | 2014-03-12 13:19:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 15:53:28 -0700 |
| commit | dbac4745270bb8a8c5f119d21ce25764e9d7557d (patch) | |
| tree | 3c0a5fa053eba76b030f9bd451f8b75321ddb264 /drivers/misc | |
| parent | 80260f2360d34912cd8cb18aca6eda20e9db2ef0 (diff) | |
mei: report consistently copy_from/to_user failures
Consistently display error on possible copy_from/to_user failures
use dev_dbg so it cannot be abused to flood the kernel log
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/amthif.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/main.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index b75a7da1ca8..2052609b167 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -244,8 +244,10 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, * the buf_idx may point beyond */ length = min_t(size_t, length, (cb->buf_idx - *offset)); - if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length)) + if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length)) { + dev_dbg(&dev->pdev->dev, "failed to copy data to userland\n"); rets = -EFAULT; + } else { rets = length; if ((*offset + length) < cb->buf_idx) { diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 4e069b88cc4..bc1c39e7264 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -280,6 +280,7 @@ copy_buffer: length = min_t(size_t, length, cb->buf_idx - *offset); if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length)) { + dev_dbg(&dev->pdev->dev, "failed to copy data to userland\n"); rets = -EFAULT; goto free; } @@ -400,7 +401,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, rets = copy_from_user(write_cb->request_buffer.data, ubuf, length); if (rets) { - dev_err(&dev->pdev->dev, "failed to copy data from userland\n"); + dev_dbg(&dev->pdev->dev, "failed to copy data from userland\n"); rets = -EFAULT; goto out; } @@ -565,7 +566,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data) dev_dbg(&dev->pdev->dev, "copy connect data from user\n"); if (copy_from_user(connect_data, (char __user *)data, sizeof(struct mei_connect_client_data))) { - dev_err(&dev->pdev->dev, "failed to copy data from userland\n"); + dev_dbg(&dev->pdev->dev, "failed to copy data from userland\n"); rets = -EFAULT; goto out; } |