From b4338420db61f029ca6713a89c41b3a5852b20ce Mon Sep 17 00:00:00 2001 From: Hariprasad Dhalinarasimha Date: Tue, 1 Oct 2013 18:25:21 -0700 Subject: qseecom: Change __copy_from_user to copy_from_user __copy_from_user does not do address check, so use copy_from_user instead. Change-Id: I575c0f3c44b55a521c0d42828988c518c0640a29 Signed-off-by: Hariprasad Dhalinarasimha --- drivers/misc/qseecom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index 04fe140..8e9731f 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -431,7 +431,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 */ @@ -604,7 +604,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"); @@ -875,7 +875,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"); @@ -2086,7 +2086,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"); @@ -2248,7 +2248,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"); -- cgit v1.1