[snip]
>> From 2712f2fd087ca782e964c912c7f1973e7d84f2b7 Mon Sep 17 00:00:00 2001
>> From: Michael Jones <michael.jones@xxxxxxxxxxxxxxxx>
>> Date: Fri, 4 Mar 2011 15:09:48 +0100
>> Subject: [PATCH] omap: iovmm: disallow mapping NULL address
>>
>> commit c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb allowed mapping
>> the NULL address if da_start==0, which would then not get unmapped.
>> Disallow this again. ÂAnd spell variable 'alignment' correctly.
>>
>> Signed-off-by: Michael Jones <michael.jones@xxxxxxxxxxxxxxxx>
>> ---
>> Âarch/arm/plat-omap/iovmm.c | Â 16 ++++++++++------
>> Â1 files changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
>> index 6dc1296..11c9b76 100644
>> --- a/arch/arm/plat-omap/iovmm.c
>> +++ b/arch/arm/plat-omap/iovmm.c
>> @@ -271,20 +271,24 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â size_t bytes, u32 flags)
>> Â{
>> Â Â Â Âstruct iovm_struct *new, *tmp;
>> - Â Â Â u32 start, prev_end, alignement;
>> + Â Â Â u32 start, prev_end, alignment;
>>
>> Â Â Â Âif (!obj || !bytes)
>> Â Â Â Â Â Â Â Âreturn ERR_PTR(-EINVAL);
>>
>> Â Â Â Âstart = da;
>> - Â Â Â alignement = PAGE_SIZE;
>> + Â Â Â alignment = PAGE_SIZE;
>>
>> Â Â Â Âif (flags & IOVMF_DA_ANON) {
>> - Â Â Â Â Â Â Â start = obj->da_start;
>> + Â Â Â Â Â Â Â /* Don't map address 0 */
>> + Â Â Â Â Â Â Â if (obj->da_start)
>> + Â Â Â Â Â Â Â Â Â Â Â start = obj->da_start;
>> + Â Â Â Â Â Â Â else
>> + Â Â Â Â Â Â Â Â Â Â Â start = obj->da_start + alignment;
>
> It seems to be fine for me now. Let's see what Hiroshi says.
Sorry, I'm afraid I changed my mind after take a look into the driver. :)
Try to correct obj->da_start in the functions iommu_set_da_range() and
omap_iommu_probe(). That should be the correct way. Your patch doesn't
fix this situation when IOVMF_DA_ANON isn't set.
After obj->da_start is correctly set, your current patch is non longer required.
Regards,
David
>
> Regards,
>
> David
>
>>
>> Â Â Â Â Â Â Â Âif (flags & IOVMF_LINEAR)
>> - Â Â Â Â Â Â Â Â Â Â Â alignement = iopgsz_max(bytes);
>> - Â Â Â Â Â Â Â start = roundup(start, alignement);
>> + Â Â Â Â Â Â Â Â Â Â Â alignment = iopgsz_max(bytes);
>> + Â Â Â Â Â Â Â start = roundup(start, alignment);
>> Â Â Â Â} else if (start < obj->da_start || start > obj->da_end ||
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âobj->da_end - start < bytes) {
>> Â Â Â Â Â Â Â Âreturn ERR_PTR(-EINVAL);
>> @@ -304,7 +308,7 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
>> Â Â Â Â Â Â Â Â Â Â Â Âgoto found;
>>
>> Â Â Â Â Â Â Â Â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;
>> Â Â Â Â}
>> --
>> 1.7.4.1
>>
>>
>>
>> MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
>> Registergericht: Amtsgericht Stuttgart, HRB 271090
>> Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
