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

Commit 4d0a279c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'chrome-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform 

Pull chrome platform fix from Olof Johansson:
 "A single fix this time, closing a window where ioctl args are fetched
  twice"

* tag 'chrome-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
  platform/chrome: cros_ec_dev - double fetch bug in ioctl
parents a99cde43 096cdc6f

drivers/platform/chrome/cros_ec_dev.c

+7 −1
Original line number Diff line number Diff line
@@ -151,13 +151,19 @@ static long ec_device_ioctl_xcmd(struct cros_ec_dev *ec, void __user *arg) 
		goto exit;

	}



	if (u_cmd.outsize != s_cmd->outsize ||

	    u_cmd.insize != s_cmd->insize) {

		ret = -EINVAL;

		goto exit;

	}



	s_cmd->command += ec->cmd_offset;

	ret = cros_ec_cmd_xfer(ec->ec_dev, s_cmd);

	/* Only copy data to userland if data was received. */

	if (ret < 0)

		goto exit;



	if (copy_to_user(arg, s_cmd, sizeof(*s_cmd) + u_cmd.insize))

	if (copy_to_user(arg, s_cmd, sizeof(*s_cmd) + s_cmd->insize))

		ret = -EFAULT;

exit:

	kfree(s_cmd);