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

Commit 38b7ac0a authored by Sherry Sun's avatar Sherry Sun Committed by Greg Kroah-Hartman
Browse files

mic: vop: copy data to kernel space then write to io memory 



[ Upstream commit 675f0ad4046946e80412896436164d172cd92238 ]

Read and write io memory should address align on ARCH ARM. Change to use
memcpy_toio to avoid kernel panic caused by the address un-align issue.

Signed-off-by: default avatarSherry Sun <sherry.sun@nxp.com>
Signed-off-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Link: https://lore.kernel.org/r/20200929091106.24624-5-sherry.sun@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d583c728

drivers/misc/mic/vop/vop_vringh.c

+14 −6
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ static int vop_virtio_copy_from_user(struct vop_vdev *vdev, void __user *ubuf, 
	size_t partlen;

	bool dma = VOP_USE_DMA;

	int err = 0;

	size_t offset = 0;



	if (daddr & (dma_alignment - 1)) {

		vdev->tx_dst_unaligned += len;
@@ -659,13 +660,20 @@ static int vop_virtio_copy_from_user(struct vop_vdev *vdev, void __user *ubuf, 
	 * We are copying to IO below and should ideally use something

	 * like copy_from_user_toio(..) if it existed.

	 */

	if (copy_from_user((void __force *)dbuf, ubuf, len)) {

	while (len) {

		partlen = min_t(size_t, len, VOP_INT_DMA_BUF_SIZE);



		if (copy_from_user(vvr->buf, ubuf + offset, partlen)) {

			err = -EFAULT;

			dev_err(vop_dev(vdev), "%s %d err %d\n",

				__func__, __LINE__, err);

			goto err;

		}

	vdev->out_bytes += len;

		memcpy_toio(dbuf + offset, vvr->buf, partlen);

		offset += partlen;

		vdev->out_bytes += partlen;

		len -= partlen;

	}

	err = 0;

err:

	vpdev->hw_ops->iounmap(vpdev, dbuf);