Merge "qseecom: Check the return value of "ion_phys"" (cbff5245) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/misc/qseecom.c

+28 −2

Original line number	Diff line number	Diff line
		@@ -281,7 +281,11 @@ static int __qseecom_set_sb_memory(struct qseecom_registered_listener_list *svc,

		/* Get the physical address of the ION BUF */
		ret = ion_phys(qseecom.ion_clnt, svc->ihandle, &pa, &svc->sb_length);

		if (ret) {
		pr_err("Cannot get phys_addr for the Ion Client, ret = %d\n",
		ret);
		return ret;
		}
		/* Populate the structure for sending scm call to load image */
		svc->sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt, svc->ihandle);
		svc->sb_phys = pa;
		@@ -641,6 +645,13 @@ static int qseecom_set_client_mem_param(struct qseecom_dev_handle *data,
		}
		/* Get the physical address of the ION BUF */
		ret = ion_phys(qseecom.ion_clnt, data->client.ihandle, &pa, &len);
		if (ret) {

		pr_err("Cannot get phys_addr for the Ion Client, ret = %d\n",
		ret);
		return ret;
		}

		if (len < req.sb_len) {
		pr_err("Requested length (0x%x) is > allocated (0x%x)\n",
		req.sb_len, len);
		@@ -860,6 +871,11 @@ static int qseecom_load_app(struct qseecom_dev_handle data, void __user argp)

		/* Get the physical address of the ION BUF */
		ret = ion_phys(qseecom.ion_clnt, ihandle, &pa, &len);
		if (ret) {
		pr_err("Cannot get phys_addr for the Ion Client, ret = %d\n",
		ret);
		return ret;
		}

		/* Populate the structure for sending scm call to load image */
		memcpy(load_req.app_name, load_img_req.img_name,
		@@ -2067,6 +2083,12 @@ int qseecom_start_app(struct qseecom_handle **handle,

		/* Get the physical address of the ION BUF */
		ret = ion_phys(qseecom.ion_clnt, data->client.ihandle, &pa, &len);
		if (ret) {
		pr_err("Cannot get phys_addr for the Ion Client, ret = %d\n",
		ret);
		goto err;
		}

		/* Populate the structure for sending scm call to load image */
		data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt,
		data->client.ihandle);
		@@ -2572,7 +2594,11 @@ static int qseecom_load_external_elf(struct qseecom_dev_handle *data,

		/* Get the physical address of the ION BUF */
		ret = ion_phys(qseecom.ion_clnt, ihandle, &pa, &len);

		if (ret) {
		pr_err("Cannot get phys_addr for the Ion Client, ret = %d\n",
		ret);
		return ret;
		}
		/* Populate the structure for sending scm call to load image */
		load_req.qsee_cmd_id = QSEOS_LOAD_EXTERNAL_ELF_COMMAND;
		load_req.mdt_len = load_img_req.mdt_len;