evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

omap iommu: fix incorrect address for largepage 1st entry

Browse source 
There was a potential risk that the following "memset" could override
its range if a given address was not the 1st entry of a
largepage. This is not the case for "iovmm".

Reported-by: Hari Nagalla <hnagalla@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Hari Nagalla <hnagalla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Hiroshi DOYU 2010-02-15 10:03:32 -08:00 • committed by Tony Lindgren
parent 8d33ea5881
commit c127c7dc1a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/plat-omap/iommu.c
View file

@ -1,7 +1,7 @@
/* /*
* omap iommu: tlb and pagetable primitives * omap iommu: tlb and pagetable primitives
* *
* Copyright (C) 2008-2009 Nokia Corporation * Copyright (C) 2008-2010 Nokia Corporation
* *
* Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>, * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>,
* Paul Mundt and Toshihiro Kobayashi * Paul Mundt and Toshihiro Kobayashi
@ -646,7 +646,7 @@ static size_t iopgtable_clear_entry_core(struct iommu *obj, u32 da)
if (*iopte & IOPTE_LARGE) { if (*iopte & IOPTE_LARGE) {
nent *= 16; nent *= 16;
/* rewind to the 1st entry */ /* rewind to the 1st entry */
iopte = (u32 *)((u32)iopte & IOLARGE_MASK); iopte = iopte_offset(iopgd, (da & IOLARGE_MASK));
} }
bytes *= nent; bytes *= nent;
memset(iopte, 0, nent * sizeof(*iopte)); memset(iopte, 0, nent * sizeof(*iopte));