[PATCH v2 1/4] firmware: qcom: tzmem: guard against IS_ERR() in the cleanup handler
Bartosz Golaszewski <[email protected]>
| Newsgroups | org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
We currently only silently skip NULL-pointers in the cleanup handler for tzmem. It's possible that we get passed a pointer holding an ERR_PTR() value so skip it too. Reviewed-by: Konrad Dybcio <[email protected]> Reviewed-by: Mukesh Ojha <[email protected]> Signed-off-by: Bartosz Golaszewski <[email protected]> --- include/linux/firmware/qcom/qcom_tzmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/firmware/qcom/qcom_tzmem.h b/include/linux/firmware/qcom/qcom_tzmem.h index 23173e0c3dddd154dd56dc3dcb56bd20ada0520a..b5520178bf6f53b86b530571a3be9f302225f022 100644 --- a/include/linux/firmware/qcom/qcom_tzmem.h +++ b/include/linux/firmware/qcom/qcom_tzmem.h @@ -58,7 +58,7 @@ devm_qcom_tzmem_pool_new(struct device *dev, void *qcom_tzmem_alloc(struct qcom_tzmem_pool *pool, size_t size, gfp_t gfp); void qcom_tzmem_free(void *ptr); -DEFINE_FREE(qcom_tzmem, void *, if (_T) qcom_tzmem_free(_T)) +DEFINE_FREE(qcom_tzmem, void *, if (!IS_ERR_OR_NULL(_T)) qcom_tzmem_free(_T)) phys_addr_t qcom_tzmem_to_phys(void *ptr); -- 2.47.3