Merge "arm64: mm: dma-mapping: Fix possible null dereference" (88d48e52) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/mm/dma-mapping.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1241,13 +1241,14 @@ int __depr_arm_iommu_attach_device(struct device *dev,
		{
		int err;
		struct iommu_domain *domain;
		struct iommu_group *group = dev->iommu_group;
		struct iommu_group *group;

		if (!dev \|\| !mapping) {
		pr_err("%s: Error input is NULL\n", __func__);
		return -EINVAL;
		}

		group = dev->iommu_group;
		if (!group) {
		dev_err(dev, "No iommu associated with device\n");
		return -EINVAL;