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

Commit 19f729f8 authored by Patrick Daly's avatar Patrick Daly
Browse files

arm64: mm: dma-mapping: Add additional error checking 



Add extra input argument validation.

Change-Id: Ia2bc8da8c8d1c03cea6270bf632b1c4ed1740c02
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 11ec78dc

arch/arm64/mm/dma-mapping.c

+10 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,11 @@ static void arm_iommu_get_dma_window(struct device *dev, u64 *dma_addr, 
			naddr + nsize);

		return;

	}

	if (naddr == 0 || nsize == 0) {

		dev_err(dev, "Invalid #address-cells %d or #size-cells %d\n",

			naddr, nsize);

		return;

	}



	*dma_addr = of_read_number(ranges, naddr);

	*dma_size = of_read_number(ranges + naddr, nsize);
@@ -1238,6 +1243,11 @@ int __depr_arm_iommu_attach_device(struct device *dev, 
	struct iommu_domain *domain;

	struct iommu_group *group = dev->iommu_group;



	if (!dev || !mapping) {

		pr_err("%s: Error input is NULL\n", __func__);

		return -EINVAL;

	}



	if (!group) {

		dev_err(dev, "No iommu associated with device\n");

		return -EINVAL;