Commit 4359d38d authored by Michael Jones's avatar Michael Jones Committed by Tony Lindgren

omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set

commit c7f4ab26 allowed mapping the NULL
address if da_start==0, which would then not get unmapped. Disallow
this again if IOVMF_DA_ANON is set. And spell variable 'alignment'
correctly.
Signed-off-by: default avatarMichael Jones <michael.jones@matrix-vision.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 42924355
...@@ -271,20 +271,21 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, ...@@ -271,20 +271,21 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
size_t bytes, u32 flags) size_t bytes, u32 flags)
{ {
struct iovm_struct *new, *tmp; struct iovm_struct *new, *tmp;
u32 start, prev_end, alignement; u32 start, prev_end, alignment;
if (!obj || !bytes) if (!obj || !bytes)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
start = da; start = da;
alignement = PAGE_SIZE; alignment = PAGE_SIZE;
if (flags & IOVMF_DA_ANON) { if (flags & IOVMF_DA_ANON) {
start = obj->da_start; /* Don't map address 0 */
start = obj->da_start ? obj->da_start : alignment;
if (flags & IOVMF_LINEAR) if (flags & IOVMF_LINEAR)
alignement = iopgsz_max(bytes); alignment = iopgsz_max(bytes);
start = roundup(start, alignement); start = roundup(start, alignment);
} else if (start < obj->da_start || start > obj->da_end || } else if (start < obj->da_start || start > obj->da_end ||
obj->da_end - start < bytes) { obj->da_end - start < bytes) {
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
...@@ -304,7 +305,7 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, ...@@ -304,7 +305,7 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
goto found; goto found;
if (tmp->da_end >= start && flags & IOVMF_DA_ANON) if (tmp->da_end >= start && flags & IOVMF_DA_ANON)
start = roundup(tmp->da_end + 1, alignement); start = roundup(tmp->da_end + 1, alignment);
prev_end = tmp->da_end; prev_end = tmp->da_end;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment