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

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

Merge "msm: ipa: fix potential NULL deference on SMMU"

parents 953a0bb6 2746533e

drivers/platform/msm/ipa/ipa_v2/ipa.c

+2 −2
Original line number Diff line number Diff line
@@ -4538,7 +4538,7 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) 
	cb->dev = dev;

	cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev),

				cb->va_start, cb->va_size);

	if (IS_ERR(cb->mapping)) {

	if (IS_ERR_OR_NULL(cb->mapping)) {

		IPADBG("Fail to create mapping\n");

		/* assume this failure is because iommu driver is not ready */

		return -EPROBE_DEFER;
@@ -4641,7 +4641,7 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) 
	cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev),

					       cb->va_start,

					       cb->va_size);

	if (IS_ERR(cb->mapping)) {

	if (IS_ERR_OR_NULL(cb->mapping)) {

		IPADBG("Fail to create mapping\n");

		/* assume this failure is because iommu driver is not ready */

		return -EPROBE_DEFER;

drivers/platform/msm/ipa/ipa_v3/ipa.c

+2 −2
Original line number Diff line number Diff line
@@ -4879,7 +4879,7 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) 
	cb->dev = dev;

	cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev),

			cb->va_start, cb->va_size);

	if (IS_ERR(cb->mapping)) {

	if (IS_ERR_OR_NULL(cb->mapping)) {

		IPADBG("Fail to create mapping\n");

		/* assume this failure is because iommu driver is not ready */

		return -EPROBE_DEFER;
@@ -4992,7 +4992,7 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) 
	cb->dev = dev;

	cb->mapping = arm_iommu_create_mapping(msm_iommu_get_bus(dev),

					cb->va_start, cb->va_size);

	if (IS_ERR(cb->mapping)) {

	if (IS_ERR_OR_NULL(cb->mapping)) {

		IPADBG("Fail to create mapping\n");

		/* assume this failure is because iommu driver is not ready */

		return -EPROBE_DEFER;