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

Commit 66084ce5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qseecom: check error return value of ion_map_kernel"

parents a9a8d7a9 915b73c7

drivers/misc/qseecom.c

+13 −0
Original line number Diff line number Diff line
@@ -1065,6 +1065,10 @@ static int __qseecom_set_sb_memory(struct qseecom_registered_listener_list *svc, 
	}

	/* Populate the structure for sending scm call to load image */

	svc->sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt, svc->ihandle);

	if (IS_ERR_OR_NULL(svc->sb_virt)) {

		pr_err("ION memory mapping for listener shared buffer failed\n");

		return -ENOMEM;

	}

	svc->sb_phys = (phys_addr_t)pa;



	if (qseecom.qsee_version < QSEE_VERSION_40) {
@@ -1522,6 +1526,10 @@ static int qseecom_set_client_mem_param(struct qseecom_dev_handle *data, 
	/* Populate the structure for sending scm call to load image */

	data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt,

							data->client.ihandle);

	if (IS_ERR_OR_NULL(data->client.sb_virt)) {

		pr_err("ION memory mapping for client shared buf failed\n");

		return -ENOMEM;

	}

	data->client.sb_phys = (phys_addr_t)pa;

	data->client.sb_length = req.sb_len;

	data->client.user_virt_sb_base = (uintptr_t)req.virt_sb_base;
@@ -4202,6 +4210,11 @@ int qseecom_start_app(struct qseecom_handle **handle, 
	/* Populate the structure for sending scm call to load image */

	data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt,

							data->client.ihandle);

	if (IS_ERR_OR_NULL(data->client.sb_virt)) {

		pr_err("ION memory mapping for client shared buf failed\n");

		ret = -ENOMEM;

		goto err;

	}

	data->client.user_virt_sb_base = (uintptr_t)data->client.sb_virt;

	data->client.sb_phys = (phys_addr_t)pa;

	(*handle)->dev = (void *)data;