diff mbox

[1/5] omap iommu: Reject unaligned physical address at setting page table entry

Message ID 1273215364-15098-1-git-send-email-Hiroshi.DOYU@nokia.com (mailing list archive)
State Changes Requested, archived
Delegated to: Hiroshi DOYU
Headers show

Commit Message

Hiroshi DOYU May 7, 2010, 6:56 a.m. UTC
None
diff mbox

Patch

diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index 0e13766..b3591ee 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -503,6 +503,12 @@  static int iopgd_alloc_section(struct iommu *obj, u32 da, u32 pa, u32 prot)
 {
 	u32 *iopgd = iopgd_offset(obj, da);
 
+	if (pa & ~IOSECTION_MASK) {
+		dev_err(obj->dev, "%s: pa:%08x should aligned on %08lx\n",
+			__func__, pa, IOSECTION_SIZE);
+		return -EINVAL;
+	}
+
 	*iopgd = (pa & IOSECTION_MASK) | prot | IOPGD_SECTION;
 	flush_iopgd_range(iopgd, iopgd);
 	return 0;
@@ -513,6 +519,12 @@  static int iopgd_alloc_super(struct iommu *obj, u32 da, u32 pa, u32 prot)
 	u32 *iopgd = iopgd_offset(obj, da);
 	int i;
 
+	if (pa & ~IOSUPER_MASK) {
+		dev_err(obj->dev, "%s: pa:%08x should aligned on %08lx\n",
+			__func__, pa, IOSUPER_SIZE);
+		return -EINVAL;
+	}
+
 	for (i = 0; i < 16; i++)
 		*(iopgd + i) = (pa & IOSUPER_MASK) | prot | IOPGD_SUPER;
 	flush_iopgd_range(iopgd, iopgd + 15);
@@ -542,6 +554,12 @@  static int iopte_alloc_large(struct iommu *obj, u32 da, u32 pa, u32 prot)
 	u32 *iopte = iopte_alloc(obj, iopgd, da);
 	int i;
 
+	if (pa & ~IOLARGE_MASK) {
+		dev_err(obj->dev, "%s: pa:%08x should aligned on %08lx\n",
+			__func__, pa, IOLARGE_SIZE);
+		return -EINVAL;
+	}
+
 	if (IS_ERR(iopte))
 		return PTR_ERR(iopte);