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

Commit 35d2172f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mink: Fix copy_to_user issue"

parents 203fc57f 7c77e4ba

drivers/soc/qcom/smcinvoke.c

+5 −5
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ static long process_accept_req(struct file *filp, unsigned int cmd, 
		return -EINVAL;

	}



	if (copy_from_user(&user_args, (void __user *)arg,

	if (copy_from_user(&user_args, (void __user *)(uintptr_t)arg,

					sizeof(struct smcinvoke_accept))) {

		pr_err("copying accept request from user failed\n");

		return -EFAULT;
@@ -1669,8 +1669,8 @@ static long process_accept_req(struct file *filp, unsigned int cmd, 
							cb_txn->txn_id);

			kref_put(&cb_txn->ref_cnt, delete_cb_txn);

			mutex_unlock(&g_smcinvoke_lock);

			ret =  copy_to_user((void __user *)arg, &user_args,

					sizeof(struct smcinvoke_accept));

			ret =  copy_to_user((void __user *)(uintptr_t)arg,

				&user_args, sizeof(struct smcinvoke_accept));

		}

	} while (!cb_txn);

out:
@@ -1715,7 +1715,7 @@ static long process_invoke_req(struct file *filp, unsigned int cmd, 
		return -EPERM;

	}



	ret = copy_from_user(&req, (void __user *)arg, sizeof(req));

	ret = copy_from_user(&req, (void __user *)(uintptr_t)arg, sizeof(req));

	if (ret) {

		pr_err("copying invoke req failed\n");

		return -EFAULT;
@@ -1799,7 +1799,7 @@ static long process_invoke_req(struct file *filp, unsigned int cmd, 
					nr_args * req.argsize);

	}

	/* copy result of invoke op */

	ret |=  copy_to_user((void __user *)arg, &req, sizeof(req));

	ret |=  copy_to_user((void __user *)(uintptr_t)arg, &req, sizeof(req));

	if (ret)

		goto out;