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

Commit 5d3347b4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "firmware: qcom_scm: Check for NULL before dereferencing __scm"

parents b8aa4aba cceceac1

drivers/firmware/qcom_scm-smc.c

+1 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ int __qcom_scm_mem_protect_region_id(struct device *dev, phys_addr_t paddr, 


	desc.args[0] = paddr;

	desc.args[1] = size;

	desc.arginfo = QCOM_SCM_ARGS(2);

	desc.arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_RO, QCOM_SCM_VAL);



	ret = qcom_scm_call(dev, &desc);

drivers/firmware/qcom_scm.c

+2 −1
Original line number Diff line number Diff line
@@ -452,7 +452,8 @@ EXPORT_SYMBOL(qcom_scm_mem_protect_video); 


int qcom_scm_mem_protect_region_id(phys_addr_t paddr, size_t size)

{

	return __qcom_scm_mem_protect_region_id(__scm->dev, paddr, size);

	return __qcom_scm_mem_protect_region_id(__scm ? __scm->dev : NULL,

								paddr, size);

}

EXPORT_SYMBOL(qcom_scm_mem_protect_region_id);