Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbac4745 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80260f23

drivers/misc/mei/amthif.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/misc/mei/main.c

+3 −2
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, 
	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;

	}