summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/mei/main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 173ff095be0d..5ff810b1e8b3 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -404,8 +404,11 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
404 goto out; 404 goto out;
405 405
406 rets = copy_from_user(write_cb->request_buffer.data, ubuf, length); 406 rets = copy_from_user(write_cb->request_buffer.data, ubuf, length);
407 if (rets) 407 if (rets) {
408 dev_err(&dev->pdev->dev, "failed to copy data from userland\n");
409 rets = -EFAULT;
408 goto out; 410 goto out;
411 }
409 412
410 if (cl == &dev->iamthif_cl) { 413 if (cl == &dev->iamthif_cl) {
411 rets = mei_amthif_write(dev, write_cb); 414 rets = mei_amthif_write(dev, write_cb);
@@ -567,7 +570,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
567 dev_dbg(&dev->pdev->dev, "copy connect data from user\n"); 570 dev_dbg(&dev->pdev->dev, "copy connect data from user\n");
568 if (copy_from_user(connect_data, (char __user *)data, 571 if (copy_from_user(connect_data, (char __user *)data,
569 sizeof(struct mei_connect_client_data))) { 572 sizeof(struct mei_connect_client_data))) {
570 dev_dbg(&dev->pdev->dev, "failed to copy data from userland\n"); 573 dev_err(&dev->pdev->dev, "failed to copy data from userland\n");
571 rets = -EFAULT; 574 rets = -EFAULT;
572 goto out; 575 goto out;
573 } 576 }