Merge "qseecom: Add proper checks for ION handle" (c2a5169d) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/misc/qseecom.c

+26 −0

Original line number	Diff line number	Diff line
		@@ -763,6 +763,12 @@ static int __qseecom_process_incomplete_cmd(struct qseecom_dev_handle *data,
		pr_err("Listener Svc %d does not exist\n", lstnr);
		return -EINVAL;
		}

		if (!ptr_svc->ihandle) {
		pr_err("Client handle is not initialized\n");
		return -EINVAL;
		}

		if (ptr_svc->svc.listener_id != lstnr) {
		pr_warning("Service requested for does on exist\n");
		return -ERESTARTSYS;
		@@ -1283,6 +1289,11 @@ static int qseecom_send_service_cmd(struct qseecom_dev_handle *data,
		return -EINVAL;
		}

		if (!data \|\| !data->client.ihandle) {
		pr_err("Client or client handle is not initialized\n");
		return -EINVAL;
		}

		if (data->client.sb_virt == NULL) {
		pr_err("sb_virt null\n");
		return -EINVAL;
		@@ -1454,6 +1465,11 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data,
		return -ENOMEM;
		}

		if (!data \|\| !data->client.ihandle) {
		pr_err("Client or client handle is not initialized\n");
		return -EINVAL;
		}

		send_data_req.qsee_cmd_id = QSEOS_CLIENT_SEND_DATA_COMMAND;
		send_data_req.app_id = data->client.app_id;
		send_data_req.req_ptr = (uint32_t)(__qseecom_uvirt_to_kphys(data,
		@@ -3533,6 +3549,11 @@ static int __qseecom_qteec_issue_cmd(struct qseecom_dev_handle *data,
		int ret = 0;
		uint32_t reqd_len_sb_in = 0;

		if (!data \|\| !data->client.ihandle) {
		pr_err("Client or client handle is not initialized\n");
		return -EINVAL;
		}

		ret = __qseecom_qteec_validate_msg(data, req);
		if (ret)
		return ret;
		@@ -3627,6 +3648,11 @@ static int qseecom_qteec_invoke_modfd_cmd(struct qseecom_dev_handle *data,
		return ret;
		}

		if (!data \|\| !data->client.ihandle) {
		pr_err("Client or client handle is not initialized\n");
		return -EINVAL;
		}

		ret = __qseecom_qteec_validate_msg(data,
		(struct qseecom_qteec_req *)(&req));
		if (ret)