Merge "qseecom: Change __copy_from_user to copy_from_user" (4a149ed1) · Commits · e / devices / android_kernel_sony_msm8994

drivers/misc/qseecom.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -589,7 +589,7 @@ static int qseecom_set_client_mem_param(struct qseecom_dev_handle *data,
		uint32_t len;

		/* Copy the relevant information needed for loading the image */
		if (__copy_from_user(&req, (void __user *)argp, sizeof(req)))
		if (copy_from_user(&req, (void __user *)argp, sizeof(req)))
		return -EFAULT;

		/* Get the handle of the shared fd */
		@@ -762,7 +762,7 @@ static int qseecom_load_app(struct qseecom_dev_handle data, void __user argp)
		struct qseecom_load_app_ireq load_req;

		/* Copy the relevant information needed for loading the image */
		if (__copy_from_user(&load_img_req,
		if (copy_from_user(&load_img_req,
		(void __user *)argp,
		sizeof(struct qseecom_load_img_req))) {
		pr_err("copy_from_user failed\n");
		@@ -1033,7 +1033,7 @@ static int qseecom_send_service_cmd(struct qseecom_dev_handle *data,
		struct qseecom_send_svc_cmd_req req;
		/struct qseecom_command_scm_resp resp;/

		if (__copy_from_user(&req,
		if (copy_from_user(&req,
		(void __user *)argp,
		sizeof(req))) {
		pr_err("copy_from_user failed\n");
		@@ -2284,7 +2284,7 @@ static int qseecom_load_external_elf(struct qseecom_dev_handle *data,
		struct qseecom_command_scm_resp resp;

		/* Copy the relevant information needed for loading the image */
		if (__copy_from_user(&load_img_req,
		if (copy_from_user(&load_img_req,
		(void __user *)argp,
		sizeof(struct qseecom_load_img_req))) {
		pr_err("copy_from_user failed\n");
		@@ -2445,7 +2445,7 @@ static int qseecom_query_app_loaded(struct qseecom_dev_handle *data,
		unsigned long flags = 0;

		/* Copy the relevant information needed for loading the image */
		if (__copy_from_user(&query_req,
		if (copy_from_user(&query_req,
		(void __user *)argp,
		sizeof(struct qseecom_qseos_app_load_query))) {
		pr_err("copy_from_user failed\n");